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

mtd: rawnand: arasan: 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 "disable_bus_clk" and "disable_controller_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-3-lizetao1@huawei.com
parent a82990c8

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

+5 −24
Original line number Diff line number Diff line
@@ -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[] = {