| Message ID | 20230818074642.308166-3-lizetao1@huawei.com |
|---|---|
| State | New |
| Headers | show |
| Series | mtd: Use devm_clk_get_*() helper function to simplify the drivers. | expand |
Hi Li, lizetao1@huawei.com wrote on Fri, 18 Aug 2023 15:46:32 +0800: > 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 enable (and possibly For all the commit logs: the driver enables (and possibly prepares) > prepare) the clocks for the whole lifetime of the device. Moreover, it is > no longer necessary to unprepare and disable the clock explicitly, so drop For all the commit logs: the clocks The ",so drop the label xxx" is not needed I believe. > the label "disable_bus_clk" and "disable_controller_clk". > > Signed-off-by: Li Zetao <lizetao1@huawei.com> > --- Thanks, Miquèl
miquel.raynal@bootlin.com wrote on Fri, 18 Aug 2023 10:10:04 +0200: > Hi Li, > > lizetao1@huawei.com wrote on Fri, 18 Aug 2023 15:46:32 +0800: > > > 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 enable (and possibly > > For all the commit logs: the driver enables (and possibly prepares) > > > prepare) the clocks for the whole lifetime of the device. Moreover, it is > > no longer necessary to unprepare and disable the clock explicitly, so drop > > For all the commit logs: the clocks > > The ",so drop the label xxx" is not needed I believe. > > > the label "disable_bus_clk" and "disable_controller_clk". Actually it does not bother, just keep it. > > Signed-off-by: Li Zetao <lizetao1@huawei.com> > > --- > > Thanks, > Miquèl Thanks, Miquèl
diff --git a/drivers/mtd/nand/raw/arasan-nand-controller.c b/drivers/mtd/nand/raw/arasan-nand-controller.c index 906eef70cb6d..4621ec549cc7 100644 --- a/drivers/mtd/nand/raw/arasan-nand-controller.c +++ b/drivers/mtd/nand/raw/arasan-nand-controller.c @@ -1440,45 +1440,29 @@ static int anfc_probe(struct platform_device *pdev) anfc_reset(nfc); - nfc->controller_clk = devm_clk_get(&pdev->dev, "controller"); + nfc->controller_clk = devm_clk_get_enabled(&pdev->dev, "controller"); if (IS_ERR(nfc->controller_clk)) return PTR_ERR(nfc->controller_clk); - nfc->bus_clk = devm_clk_get(&pdev->dev, "bus"); + nfc->bus_clk = devm_clk_get_enabled(&pdev->dev, "bus"); if (IS_ERR(nfc->bus_clk)) return PTR_ERR(nfc->bus_clk); - ret = clk_prepare_enable(nfc->controller_clk); - if (ret) - return ret; - - ret = clk_prepare_enable(nfc->bus_clk); - if (ret) - goto disable_controller_clk; - ret = dma_set_mask(&pdev->dev, DMA_BIT_MASK(64)); if (ret) - goto disable_bus_clk; + return ret; ret = anfc_parse_cs(nfc); if (ret) - goto disable_bus_clk; + return ret; ret = anfc_chips_init(nfc); if (ret) - goto disable_bus_clk; + return ret; platform_set_drvdata(pdev, nfc); return 0; - -disable_bus_clk: - clk_disable_unprepare(nfc->bus_clk); - -disable_controller_clk: - clk_disable_unprepare(nfc->controller_clk); - - return ret; } static void anfc_remove(struct platform_device *pdev) @@ -1486,9 +1470,6 @@ static void anfc_remove(struct platform_device *pdev) struct arasan_nfc *nfc = platform_get_drvdata(pdev); anfc_chips_cleanup(nfc); - - clk_disable_unprepare(nfc->bus_clk); - clk_disable_unprepare(nfc->controller_clk); } static const struct of_device_id anfc_ids[] = {
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 enable (and possibly prepare) the clocks for the whole lifetime of the device. Moreover, it is no longer necessary to unprepare and disable the clock explicitly, so drop the label "disable_bus_clk" and "disable_controller_clk". Signed-off-by: Li Zetao <lizetao1@huawei.com> --- v1 -> v2: Modify commit message. v1: https://lore.kernel.org/all/20230817024509.3951629-3-lizetao1@huawei.com/ drivers/mtd/nand/raw/arasan-nand-controller.c | 29 ++++--------------- 1 file changed, 5 insertions(+), 24 deletions(-)