[PATCH 14/31] spi: spi-qcom-qspi: convert to use devm_pm_opp_* API

[Yangtao Li]

Use devm_pm_opp_* API to simplify code, and remove opp_table
from qcom_qspi.

Signed-off-by: Yangtao Li <tiny.win...@gmail.com>
---
 drivers/spi/spi-qcom-qspi.c | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/drivers/spi/spi-qcom-qspi.c b/drivers/spi/spi-qcom-qspi.c
index 915ae115d8c1..1a1ab153ff59 100644
--- a/drivers/spi/spi-qcom-qspi.c
+++ b/drivers/spi/spi-qcom-qspi.c
@@ -142,7 +142,6 @@ struct qcom_qspi {
        struct clk_bulk_data *clks;
        struct qspi_xfer xfer;
        struct icc_path *icc_path_cpu_to_qspi;
-       struct opp_table *opp_table;
        unsigned long last_speed;
        /* Lock to protect data accessed by IRQs */
        spinlock_t lock;
@@ -459,6 +458,7 @@ static int qcom_qspi_probe(struct platform_device *pdev)
        struct device *dev;
        struct spi_master *master;
        struct qcom_qspi *ctrl;
+       struct opp_table *opp_table;
 
        dev = &pdev->dev;
 
@@ -531,13 +531,13 @@ static int qcom_qspi_probe(struct platform_device *pdev)
        master->handle_err = qcom_qspi_handle_err;
        master->auto_runtime_pm = true;
 
-       ctrl->opp_table = dev_pm_opp_set_clkname(&pdev->dev, "core");
-       if (IS_ERR(ctrl->opp_table))
-               return PTR_ERR(ctrl->opp_table);
+       opp_table = devm_pm_opp_set_clkname(dev, "core");
+       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(dev);
        if (ret) {
-               dev_pm_opp_put_clkname(ctrl->opp_table);
+               devm_pm_opp_put_clkname(dev, opp_table);
                if (ret != -ENODEV) {
                        dev_err(&pdev->dev, "invalid OPP table in device 
tree\n");
                        return ret;
@@ -553,8 +553,6 @@ static int qcom_qspi_probe(struct platform_device *pdev)
                return 0;
 
        pm_runtime_disable(dev);
-       dev_pm_opp_of_remove_table(&pdev->dev);
-       dev_pm_opp_put_clkname(ctrl->opp_table);
 
        return ret;
 }
@@ -568,8 +566,6 @@ static int qcom_qspi_remove(struct platform_device *pdev)
        spi_unregister_master(master);
 
        pm_runtime_disable(&pdev->dev);
-       dev_pm_opp_of_remove_table(&pdev->dev);
-       dev_pm_opp_put_clkname(ctrl->opp_table);
 
        return 0;
 }
-- 
2.25.1