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.ku...@linaro.org>
---
 drivers/spi/spi-geni-qcom.c | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/drivers/spi/spi-geni-qcom.c b/drivers/spi/spi-geni-qcom.c
index 80cea5cd3612..5d3904a0aff8 100644
--- a/drivers/spi/spi-geni-qcom.c
+++ b/drivers/spi/spi-geni-qcom.c
@@ -613,9 +613,7 @@ static int spi_geni_probe(struct platform_device *pdev)
                return PTR_ERR(mas->se.opp_table);
        /* OPP table is optional */
        ret = dev_pm_opp_of_add_table(&pdev->dev);
-       if (!ret) {
-               mas->se.has_opp_table = true;
-       } else if (ret != -ENODEV) {
+       if (ret != -ENODEV) {
                dev_err(&pdev->dev, "invalid OPP table in device tree\n");
                return ret;
        }
@@ -669,8 +667,7 @@ static int spi_geni_probe(struct platform_device *pdev)
 spi_geni_probe_runtime_disable:
        pm_runtime_disable(dev);
        spi_master_put(spi);
-       if (mas->se.has_opp_table)
-               dev_pm_opp_of_remove_table(&pdev->dev);
+       dev_pm_opp_of_remove_table(&pdev->dev);
        dev_pm_opp_put_clkname(mas->se.opp_table);
        return ret;
 }
@@ -685,8 +682,7 @@ static int spi_geni_remove(struct platform_device *pdev)
 
        free_irq(mas->irq, spi);
        pm_runtime_disable(&pdev->dev);
-       if (mas->se.has_opp_table)
-               dev_pm_opp_of_remove_table(&pdev->dev);
+       dev_pm_opp_of_remove_table(&pdev->dev);
        dev_pm_opp_put_clkname(mas->se.opp_table);
        return 0;
 }
-- 
2.25.0.rc1.19.g042ed3e048af

Reply via email to