lkml.org 
[lkml]   [2020]   [Aug]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 6/8] spi: spi-qcom-qspi: Unconditionally call dev_pm_opp_of_remove_table()
    Date
    dev_pm_opp_of_remove_table() doesn't report any errors when it fails to
    find the OPP table with error -ENODEV (i.e. OPP table not present for
    the device). And we can call dev_pm_opp_of_remove_table()
    unconditionally here.

    Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
    ---
    drivers/spi/spi-qcom-qspi.c | 11 +++--------
    1 file changed, 3 insertions(+), 8 deletions(-)

    diff --git a/drivers/spi/spi-qcom-qspi.c b/drivers/spi/spi-qcom-qspi.c
    index b8857a97f40a..7fd6f631dc17 100644
    --- a/drivers/spi/spi-qcom-qspi.c
    +++ b/drivers/spi/spi-qcom-qspi.c
    @@ -143,7 +143,6 @@ struct qcom_qspi {
    struct qspi_xfer xfer;
    struct icc_path *icc_path_cpu_to_qspi;
    struct opp_table *opp_table;
    - bool has_opp_table;
    unsigned long last_speed;
    /* Lock to protect data accessed by IRQs */
    spinlock_t lock;
    @@ -546,9 +545,7 @@ static int qcom_qspi_probe(struct platform_device *pdev)
    }
    /* OPP table is optional */
    ret = dev_pm_opp_of_add_table(&pdev->dev);
    - if (!ret) {
    - ctrl->has_opp_table = true;
    - } else if (ret != -ENODEV) {
    + if (ret != -ENODEV) {
    dev_err(&pdev->dev, "invalid OPP table in device tree\n");
    goto exit_probe_master_put;
    }
    @@ -562,8 +559,7 @@ static int qcom_qspi_probe(struct platform_device *pdev)
    return 0;

    pm_runtime_disable(dev);
    - if (ctrl->has_opp_table)
    - dev_pm_opp_of_remove_table(&pdev->dev);
    + dev_pm_opp_of_remove_table(&pdev->dev);
    dev_pm_opp_put_clkname(ctrl->opp_table);

    exit_probe_master_put:
    @@ -581,8 +577,7 @@ static int qcom_qspi_remove(struct platform_device *pdev)
    spi_unregister_master(master);

    pm_runtime_disable(&pdev->dev);
    - if (ctrl->has_opp_table)
    - dev_pm_opp_of_remove_table(&pdev->dev);
    + dev_pm_opp_of_remove_table(&pdev->dev);
    dev_pm_opp_put_clkname(ctrl->opp_table);

    return 0;
    --
    2.25.0.rc1.19.g042ed3e048af
    \
     
     \ /
      Last update: 2020-08-20 12:46    [W:4.445 / U:0.152 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site