mtd: spear_smi: Use helper function devm_clk_get_enabled()

Since commit 7ef9651e9792 ("clk: Provide new devm_clk helpers for prepared
and enabled clocks"), devm_clk_get() and clk_prepare_enable() can now be
replaced by devm_clk_get_enabled() when driver enables (and possibly
prepares) the clocks for the whole lifetime of the device. Moreover, it is
no longer necessary to unprepare and disable the clocks explicitly, so drop
the label "err_irq".

Reviewed-by: Miquel Raynal <miquel.raynal@bootlin.com>
Signed-off-by: Li Zetao <lizetao1@huawei.com>
Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
Link: https://lore.kernel.org/linux-mtd/20230821031737.1973183-2-lizetao1@huawei.com

diff --git a/drivers/mtd/devices/spear_smi.c b/drivers/mtd/devices/spear_smi.c
index 93bca52..0a35e52 100644 (file)
--- a/drivers/mtd/devices/spear_smi.c
+++ b/drivers/mtd/devices/spear_smi.c
@@ -993,21 +993,17 @@ static int spear_smi_probe(struct platform_device *pdev)
                dev->num_flashes = MAX_NUM_FLASH_CHIP;
        }
 
-       dev->clk = devm_clk_get(&pdev->dev, NULL);
+       dev->clk = devm_clk_get_enabled(&pdev->dev, NULL);
        if (IS_ERR(dev->clk)) {
                ret = PTR_ERR(dev->clk);
                goto err;
        }
 
-       ret = clk_prepare_enable(dev->clk);
-       if (ret)
-               goto err;
-
        ret = devm_request_irq(&pdev->dev, irq, spear_smi_int_handler, 0,
                               pdev->name, dev);
        if (ret) {
                dev_err(&dev->pdev->dev, "SMI IRQ allocation failed\n");
-               goto err_irq;
+               goto err;
        }
 
        mutex_init(&dev->lock);
@@ -1020,14 +1016,11 @@ static int spear_smi_probe(struct platform_device *pdev)
                ret = spear_smi_setup_banks(pdev, i, pdata->np[i]);
                if (ret) {
                        dev_err(&dev->pdev->dev, "bank setup failed\n");
-                       goto err_irq;
+                       goto err;
                }
        }
 
        return 0;
-
-err_irq:
-       clk_disable_unprepare(dev->clk);
 err:
        return ret;
 }
@@ -1056,8 +1049,6 @@ static int spear_smi_remove(struct platform_device *pdev)
                WARN_ON(mtd_device_unregister(&flash->mtd));
        }
 
-       clk_disable_unprepare(dev->clk);
-
        return 0;
 }