spi: spi-geni-qcom: Convert to use resource-managed OPP API

Use resource-managed OPP API to simplify code.

Signed-off-by: Yangtao Li <tiny.windzz@gmail.com>
Acked-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Dmitry Osipenko <digetx@gmail.com>
Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>

diff --git a/drivers/spi/spi-geni-qcom.c b/drivers/spi/spi-geni-qcom.c
index 881f645661cc6137fd20cc7376e90b57e265a9f1..3d0d8ddd5772089051257060274b25b282fe55e0 100644 (file)
--- a/drivers/spi/spi-geni-qcom.c
+++ b/drivers/spi/spi-geni-qcom.c
@@ -691,14 +691,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);
+
+       ret = devm_pm_opp_set_clkname(&pdev->dev, "se");
+       if (ret)
+               return ret;
        /* 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 +751,6 @@ spi_geni_probe_free_irq:
        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 +764,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 ec2ad4b0fe14f494cbce4088e72d945614895c3b..cddef864a76008ea4bb7519e1130132d6a337783 100644 (file)
--- 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 */