mtd: rawnand: mpc5121: Use helper function devm_clk_get_enabled()
authorLi Zetao <lizetao1@huawei.com>
Mon, 21 Aug 2023 03:17:31 +0000 (11:17 +0800)
committerMiquel Raynal <miquel.raynal@bootlin.com>
Mon, 21 Aug 2023 07:39:26 +0000 (09:39 +0200)
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.

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-7-lizetao1@huawei.com
drivers/mtd/nand/raw/mpc5121_nfc.c

index ab05ee65702c85f5d9c0fc67a0312c3918b7eab1..426d6c7d405f1dde6f3122b75886c25668fad963 100644 (file)
@@ -595,8 +595,6 @@ static void mpc5121_nfc_free(struct device *dev, struct mtd_info *mtd)
        struct nand_chip *chip = mtd_to_nand(mtd);
        struct mpc5121_nfc_prv *prv = nand_get_controller_data(chip);
 
-       clk_disable_unprepare(prv->clk);
-
        if (prv->csreg)
                iounmap(prv->csreg);
 }
@@ -717,17 +715,12 @@ static int mpc5121_nfc_probe(struct platform_device *op)
        }
 
        /* Enable NFC clock */
-       clk = devm_clk_get(dev, "ipg");
+       clk = devm_clk_get_enabled(dev, "ipg");
        if (IS_ERR(clk)) {
-               dev_err(dev, "Unable to acquire NFC clock!\n");
+               dev_err(dev, "Unable to acquire and enable NFC clock!\n");
                retval = PTR_ERR(clk);
                goto error;
        }
-       retval = clk_prepare_enable(clk);
-       if (retval) {
-               dev_err(dev, "Unable to enable NFC clock!\n");
-               goto error;
-       }
        prv->clk = clk;
 
        /* Reset NAND Flash controller */