mtd: rawnand: stm32_fmc2: 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_clk_disable".

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-9-lizetao1@huawei.com

diff --git a/drivers/mtd/nand/raw/stm32_fmc2_nand.c b/drivers/mtd/nand/raw/stm32_fmc2_nand.c
index 2f9e43f64dd7790b2b7fc4d98d9e34208118ca97..88811139aaf5b9966a790c403d3fb8519350a74f 100644 (file)
--- a/drivers/mtd/nand/raw/stm32_fmc2_nand.c
+++ b/drivers/mtd/nand/raw/stm32_fmc2_nand.c
@@ -1951,21 +1951,17 @@ static int stm32_fmc2_nfc_probe(struct platform_device *pdev)
 
        init_completion(&nfc->complete);
 
-       nfc->clk = devm_clk_get(nfc->cdev, NULL);
-       if (IS_ERR(nfc->clk))
+       nfc->clk = devm_clk_get_enabled(nfc->cdev, NULL);
+       if (IS_ERR(nfc->clk)) {
+               dev_err(dev, "can not get and enable the clock\n");
                return PTR_ERR(nfc->clk);
-
-       ret = clk_prepare_enable(nfc->clk);
-       if (ret) {
-               dev_err(dev, "can not enable the clock\n");
-               return ret;
        }
 
        rstc = devm_reset_control_get(dev, NULL);
        if (IS_ERR(rstc)) {
                ret = PTR_ERR(rstc);
                if (ret == -EPROBE_DEFER)
-                       goto err_clk_disable;
+                       return ret;
        } else {
                reset_control_assert(rstc);
                reset_control_deassert(rstc);
@@ -2018,9 +2014,6 @@ err_release_dma:
        sg_free_table(&nfc->dma_data_sg);
        sg_free_table(&nfc->dma_ecc_sg);
 
-err_clk_disable:
-       clk_disable_unprepare(nfc->clk);
-
        return ret;
 }
 
@@ -2045,8 +2038,6 @@ static void stm32_fmc2_nfc_remove(struct platform_device *pdev)
        sg_free_table(&nfc->dma_data_sg);
        sg_free_table(&nfc->dma_ecc_sg);
 
-       clk_disable_unprepare(nfc->clk);
-
        stm32_fmc2_nfc_wp_enable(nand);
 }