[PATCH 09/31] spi: spi-qcom-qspi: fix potential mem leak in spi_geni_probe()

[Yangtao Li]

Use devm_pm_opp_* API to simplify code, and we don't need
to make opp_table glabal.

Let's remove opp_table from geni_se later.

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

diff --git a/drivers/spi/spi-geni-qcom.c b/drivers/spi/spi-geni-qcom.c
index 2b5a164fecb9..e330c46a9243 100644
--- a/drivers/spi/spi-geni-qcom.c
+++ b/drivers/spi/spi-geni-qcom.c
@@ -590,6 +590,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)
@@ -615,13 +616,13 @@ 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(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(dev);
        if (ret) {
-               dev_pm_opp_put_clkname(mas->se.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;
@@ -677,8 +678,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);
-       dev_pm_opp_put_clkname(mas->se.opp_table);
        return ret;
 }
 
@@ -692,8 +691,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;
 }
 
-- 
2.25.1