[PATCH v2 07/14] spi: spi-geni-qcom: Convert to use resource-managed OPP API

[Dmitry Osipenko]

From: Yangtao Li <tiny.win...@gmail.com>

Use resource-managed OPP API to simplify code.

Signed-off-by: Yangtao Li <tiny.win...@gmail.com>
Acked-by: Mark brown <broo...@kernel.org>
Signed-off-by: Dmitry Osipenko <dig...@gmail.com>
---
 drivers/spi/spi-geni-qcom.c  | 17 +++++++----------
 include/linux/qcom-geni-se.h |  2 --
 2 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/drivers/spi/spi-geni-qcom.c b/drivers/spi/spi-geni-qcom.c
index 881f645661cc..20cc29ea198b 100644
--- a/drivers/spi/spi-geni-qcom.c
+++ b/drivers/spi/spi-geni-qcom.c
@@ -666,6 +666,7 @@ static int spi_geni_probe(struct platform_device *pdev)
        void __iomem *base;
        struct clk *clk;
        struct device *dev = &pdev->dev;
+       struct opp_table *opp_table;
 
        irq = platform_get_irq(pdev, 0);
        if (irq < 0)
@@ -691,14 +692,15 @@ static int spi_geni_probe(struct platform_device *pdev)
        mas->se.wrapper = dev_get_drvdata(dev->parent);
        mas->se.base = base;
        mas->se.clk = clk;
-       mas->se.opp_table = dev_pm_opp_set_clkname(&pdev->dev, "se");
-       if (IS_ERR(mas->se.opp_table))
-               return PTR_ERR(mas->se.opp_table);
+
+       opp_table = devm_pm_opp_set_clkname(&pdev->dev, "se");
+       if (IS_ERR(opp_table))
+               return PTR_ERR(opp_table);
        /* OPP table is optional */
-       ret = dev_pm_opp_of_add_table(&pdev->dev);
+       ret = devm_pm_opp_of_add_table(&pdev->dev);
        if (ret && ret != -ENODEV) {
                dev_err(&pdev->dev, "invalid OPP table in device tree\n");
-               goto put_clkname;
+               return ret;
        }
 
        spi->bus_num = -1;
@@ -750,9 +752,6 @@ static int spi_geni_probe(struct platform_device *pdev)
        free_irq(mas->irq, spi);
 spi_geni_probe_runtime_disable:
        pm_runtime_disable(dev);
-       dev_pm_opp_of_remove_table(&pdev->dev);
-put_clkname:
-       dev_pm_opp_put_clkname(mas->se.opp_table);
        return ret;
 }
 
@@ -766,8 +765,6 @@ static int spi_geni_remove(struct platform_device *pdev)
 
        free_irq(mas->irq, spi);
        pm_runtime_disable(&pdev->dev);
-       dev_pm_opp_of_remove_table(&pdev->dev);
-       dev_pm_opp_put_clkname(mas->se.opp_table);
        return 0;
 }
 
diff --git a/include/linux/qcom-geni-se.h b/include/linux/qcom-geni-se.h
index ec2ad4b0fe14..cddef864a760 100644
--- a/include/linux/qcom-geni-se.h
+++ b/include/linux/qcom-geni-se.h
@@ -47,7 +47,6 @@ struct geni_icc_path {
  * @num_clk_levels:    Number of valid clock levels in clk_perf_tbl
  * @clk_perf_tbl:      Table of clock frequency input to serial engine clock
  * @icc_paths:         Array of ICC paths for SE
- * @opp_table:         Pointer to the OPP table
  */
 struct geni_se {
        void __iomem *base;
@@ -57,7 +56,6 @@ struct geni_se {
        unsigned int num_clk_levels;
        unsigned long *clk_perf_tbl;
        struct geni_icc_path icc_paths[3];
-       struct opp_table *opp_table;
 };
 
 /* Common SE registers */
-- 
2.29.2