Commit 7714579d authored by Li Zetao's avatar Li Zetao Committed by Miquel Raynal
Browse files

mtd: rawnand: lpc32xx_slc: Use helper function devm_clk_get_enabled() 



Since commit 7ef9651e ("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 "unprepare_clk".

Reviewed-by: default avatarMiquel Raynal <miquel.raynal@bootlin.com>
Signed-off-by: default avatarLi Zetao <lizetao1@huawei.com>
Signed-off-by: default avatarMiquel Raynal <miquel.raynal@bootlin.com>
Link: https://lore.kernel.org/linux-mtd/20230821031737.1973183-6-lizetao1@huawei.com
parent 03f2cde5

drivers/mtd/nand/raw/lpc32xx_slc.c

+3 −9
Original line number Diff line number Diff line
@@ -871,15 +871,12 @@ static int lpc32xx_nand_probe(struct platform_device *pdev) 
	mtd->dev.parent = &pdev->dev;



	/* Get NAND clock */

	host->clk = devm_clk_get(&pdev->dev, NULL);

	host->clk = devm_clk_get_enabled(&pdev->dev, NULL);

	if (IS_ERR(host->clk)) {

		dev_err(&pdev->dev, "Clock failure\n");

		res = -ENOENT;

		goto enable_wp;

	}

	res = clk_prepare_enable(host->clk);

	if (res)

		goto enable_wp;



	/* Set NAND IO addresses and command/ready functions */

	chip->legacy.IO_ADDR_R = SLC_DATA(host->io_base);
@@ -907,13 +904,13 @@ static int lpc32xx_nand_probe(struct platform_device *pdev) 
				      GFP_KERNEL);

	if (host->data_buf == NULL) {

		res = -ENOMEM;

		goto unprepare_clk;

		goto enable_wp;

	}



	res = lpc32xx_nand_dma_setup(host);

	if (res) {

		res = -EIO;

		goto unprepare_clk;

		goto enable_wp;

	}



	/* Find NAND device */
@@ -934,8 +931,6 @@ static int lpc32xx_nand_probe(struct platform_device *pdev) 
	nand_cleanup(chip);

release_dma:

	dma_release_channel(host->dma_chan);

unprepare_clk:

	clk_disable_unprepare(host->clk);

enable_wp:

	lpc32xx_wp_enable(host);
@@ -962,7 +957,6 @@ static void lpc32xx_nand_remove(struct platform_device *pdev) 
	tmp &= ~SLCCFG_CE_LOW;

	writel(tmp, SLC_CTRL(host->io_base));



	clk_disable_unprepare(host->clk);

	lpc32xx_wp_enable(host);

}