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

mtd: rawnand: fsmc: 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. The
label "disable_clk" no longer makes sense, rename it to "disable_fsmc".

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-4-lizetao1@huawei.com
parent a36201ac

drivers/mtd/nand/raw/fsmc_nand.c

+3 −9
Original line number Diff line number Diff line
@@ -1066,16 +1066,12 @@ static int __init fsmc_nand_probe(struct platform_device *pdev) 
	host->regs_va = base + FSMC_NOR_REG_SIZE +

		(host->bank * FSMC_NAND_BANK_SZ);



	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, "failed to fetch block clock\n");

		return PTR_ERR(host->clk);

	}



	ret = clk_prepare_enable(host->clk);

	if (ret)

		return ret;



	/*

	 * This device ID is actually a common AMBA ID as used on the

	 * AMBA PrimeCell bus. However it is not a PrimeCell.
@@ -1111,7 +1107,7 @@ static int __init fsmc_nand_probe(struct platform_device *pdev) 
		if (!host->read_dma_chan) {

			dev_err(&pdev->dev, "Unable to get read dma channel\n");

			ret = -ENODEV;

			goto disable_clk;

			goto disable_fsmc;

		}

		host->write_dma_chan = dma_request_channel(mask, filter, NULL);

		if (!host->write_dma_chan) {
@@ -1155,9 +1151,8 @@ static int __init fsmc_nand_probe(struct platform_device *pdev) 
release_dma_read_chan:

	if (host->mode == USE_DMA_ACCESS)

		dma_release_channel(host->read_dma_chan);

disable_clk:

disable_fsmc:

	fsmc_nand_disable(host);

	clk_disable_unprepare(host->clk);



	return ret;

}
@@ -1182,7 +1177,6 @@ static void fsmc_nand_remove(struct platform_device *pdev) 
			dma_release_channel(host->write_dma_chan);

			dma_release_channel(host->read_dma_chan);

		}

		clk_disable_unprepare(host->clk);

	}

}