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

mtd: rawnand: vf610_nfc: 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_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>
parent a95da272

drivers/mtd/nand/raw/vf610_nfc.c

+9 −20
Original line number Diff line number Diff line
@@ -834,21 +834,15 @@ static int vf610_nfc_probe(struct platform_device *pdev) 
	if (IS_ERR(nfc->regs))

		return PTR_ERR(nfc->regs);



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

	if (IS_ERR(nfc->clk))

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

	if (IS_ERR(nfc->clk)) {

		dev_err(nfc->dev, "Unable to get and enable clock!\n");

		return PTR_ERR(nfc->clk);



	err = clk_prepare_enable(nfc->clk);

	if (err) {

		dev_err(nfc->dev, "Unable to enable clock!\n");

		return err;

	}



	of_id = of_match_device(vf610_nfc_dt_ids, &pdev->dev);

	if (!of_id) {

		err = -ENODEV;

		goto err_disable_clk;

	}

	if (!of_id)

		return -ENODEV;



	nfc->variant = (uintptr_t)of_id->data;
@@ -858,9 +852,8 @@ static int vf610_nfc_probe(struct platform_device *pdev) 
			if (nand_get_flash_node(chip)) {

				dev_err(nfc->dev,

					"Only one NAND chip supported!\n");

				err = -EINVAL;

				of_node_put(child);

				goto err_disable_clk;

				return -EINVAL;

			}



			nand_set_flash_node(chip, child);
@@ -869,8 +862,7 @@ static int vf610_nfc_probe(struct platform_device *pdev) 


	if (!nand_get_flash_node(chip)) {

		dev_err(nfc->dev, "NAND chip sub-node missing!\n");

		err = -ENODEV;

		goto err_disable_clk;

		return -ENODEV;

	}



	chip->options |= NAND_NO_SUBPAGE_WRITE;
@@ -880,7 +872,7 @@ static int vf610_nfc_probe(struct platform_device *pdev) 
	err = devm_request_irq(nfc->dev, irq, vf610_nfc_irq, 0, DRV_NAME, nfc);

	if (err) {

		dev_err(nfc->dev, "Error requesting IRQ!\n");

		goto err_disable_clk;

		return err;

	}



	vf610_nfc_preinit_controller(nfc);
@@ -892,7 +884,7 @@ static int vf610_nfc_probe(struct platform_device *pdev) 
	/* Scan the NAND chip */

	err = nand_scan(chip, 1);

	if (err)

		goto err_disable_clk;

		return err;



	platform_set_drvdata(pdev, nfc);
@@ -904,8 +896,6 @@ static int vf610_nfc_probe(struct platform_device *pdev) 


err_cleanup_nand:

	nand_cleanup(chip);

err_disable_clk:

	clk_disable_unprepare(nfc->clk);

	return err;

}
@@ -918,7 +908,6 @@ static void vf610_nfc_remove(struct platform_device *pdev) 
	ret = mtd_device_unregister(nand_to_mtd(chip));

	WARN_ON(ret);

	nand_cleanup(chip);

	clk_disable_unprepare(nfc->clk);

}



#ifdef CONFIG_PM_SLEEP