Unverified Commit 0135a384 authored by Li Zetao's avatar Li Zetao Committed by Mark Brown
Browse files

spi: bcm2835aux: 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.

Reviewed-by: default avatarJonathan Cameron <Jonathan.Cameron@huawei.com>
Signed-off-by: default avatarLi Zetao <lizetao1@huawei.com>
Link: https://lore.kernel.org/r/20230823133938.1359106-8-lizetao1@huawei.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent ba85f5fa

drivers/spi/spi-bcm2835aux.c

+4 −19
Original line number Diff line number Diff line
@@ -512,7 +512,7 @@ static int bcm2835aux_spi_probe(struct platform_device *pdev) 
	if (IS_ERR(bs->regs))

		return PTR_ERR(bs->regs);



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

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

	if (IS_ERR(bs->clk)) {

		err = PTR_ERR(bs->clk);

		dev_err(&pdev->dev, "could not get clk: %d\n", err);
@@ -523,19 +523,11 @@ static int bcm2835aux_spi_probe(struct platform_device *pdev) 
	if (bs->irq < 0)

		return bs->irq;



	/* this also enables the HW block */

	err = clk_prepare_enable(bs->clk);

	if (err) {

		dev_err(&pdev->dev, "could not prepare clock: %d\n", err);

		return err;

	}



	/* just checking if the clock returns a sane value */

	clk_hz = clk_get_rate(bs->clk);

	if (!clk_hz) {

		dev_err(&pdev->dev, "clock returns 0 Hz\n");

		err = -ENODEV;

		goto out_clk_disable;

		return -ENODEV;

	}



	/* reset SPI-HW block */
@@ -547,22 +539,18 @@ static int bcm2835aux_spi_probe(struct platform_device *pdev) 
			       dev_name(&pdev->dev), host);

	if (err) {

		dev_err(&pdev->dev, "could not request IRQ: %d\n", err);

		goto out_clk_disable;

		return err;

	}



	err = spi_register_controller(host);

	if (err) {

		dev_err(&pdev->dev, "could not register SPI host: %d\n", err);

		goto out_clk_disable;

		return err;

	}



	bcm2835aux_debugfs_create(bs, dev_name(&pdev->dev));



	return 0;



out_clk_disable:

	clk_disable_unprepare(bs->clk);

	return err;

}



static void bcm2835aux_spi_remove(struct platform_device *pdev)
@@ -575,9 +563,6 @@ static void bcm2835aux_spi_remove(struct platform_device *pdev) 
	spi_unregister_controller(host);



	bcm2835aux_spi_reset_hw(bs);



	/* disable the HW block by releasing the clock */

	clk_disable_unprepare(bs->clk);

}



static const struct of_device_id bcm2835aux_spi_match[] = {