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

mtd: rawnand: intel: 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 "err_disable_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-5-lizetao1@huawei.com
parent ee0152d0

drivers/mtd/nand/raw/intel-nand-controller.c

+3 −12
Original line number Diff line number Diff line
@@ -626,16 +626,10 @@ static int ebu_nand_probe(struct platform_device *pdev) 
		goto err_of_node_put;

	}



	ebu_host->clk = devm_clk_get(dev, NULL);

	ebu_host->clk = devm_clk_get_enabled(dev, NULL);

	if (IS_ERR(ebu_host->clk)) {

		ret = dev_err_probe(dev, PTR_ERR(ebu_host->clk),

				    "failed to get clock\n");

		goto err_of_node_put;

	}



	ret = clk_prepare_enable(ebu_host->clk);

	if (ret) {

		dev_err(dev, "failed to enable clock: %d\n", ret);

				    "failed to get and enable clock\n");

		goto err_of_node_put;

	}
@@ -643,7 +637,7 @@ static int ebu_nand_probe(struct platform_device *pdev) 
	if (IS_ERR(ebu_host->dma_tx)) {

		ret = dev_err_probe(dev, PTR_ERR(ebu_host->dma_tx),

				    "failed to request DMA tx chan!.\n");

		goto err_disable_unprepare_clk;

		goto err_of_node_put;

	}



	ebu_host->dma_rx = dma_request_chan(dev, "rx");
@@ -698,8 +692,6 @@ static int ebu_nand_probe(struct platform_device *pdev) 
	nand_cleanup(&ebu_host->chip);

err_cleanup_dma:

	ebu_dma_cleanup(ebu_host);

err_disable_unprepare_clk:

	clk_disable_unprepare(ebu_host->clk);

err_of_node_put:

	of_node_put(chip_np);
@@ -716,7 +708,6 @@ static void ebu_nand_remove(struct platform_device *pdev) 
	nand_cleanup(&ebu_host->chip);

	ebu_nand_disable(&ebu_host->chip);

	ebu_dma_cleanup(ebu_host);

	clk_disable_unprepare(ebu_host->clk);

}



static const struct of_device_id ebu_nand_match[] = {