Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2025-01-06 05:06:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

spi: bcm2835aux: Use helper function devm_clk_get_enabled()

Browse Source 
Since commit 7ef9651e97 ("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: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Signed-off-by: Li Zetao <lizetao1@huawei.com>
Link: https://lore.kernel.org/r/20230823133938.1359106-8-lizetao1@huawei.com
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Li Zetao 2023-08-23 21:39:20 +08:00 committed by Mark Brown
parent ba85f5fad8
commit 0135a38436
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
1 changed files with 4 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
drivers/spi/spi-bcm2835aux.c
View File

@ -512,7 +512,7 @@ static int bcm2835aux_spi_probe(struct platform_device *pdev)
if (IS_ERR(bs->regs)) if (IS_ERR(bs->regs))
return PTR_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)) { if (IS_ERR(bs->clk)) {
err = PTR_ERR(bs->clk); err = PTR_ERR(bs->clk);
dev_err(&pdev->dev, "could not get clk: %d\n", err); 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) if (bs->irq < 0)
return bs->irq; 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 */ /* just checking if the clock returns a sane value */
clk_hz = clk_get_rate(bs->clk); clk_hz = clk_get_rate(bs->clk);
if (!clk_hz) { if (!clk_hz) {
dev_err(&pdev->dev, "clock returns 0 Hz\n"); dev_err(&pdev->dev, "clock returns 0 Hz\n");
err = -ENODEV; return -ENODEV;
goto out_clk_disable;
} }
/* reset SPI-HW block */ /* reset SPI-HW block */
@ -547,22 +539,18 @@ static int bcm2835aux_spi_probe(struct platform_device *pdev)
dev_name(&pdev->dev), host); dev_name(&pdev->dev), host);
if (err) { if (err) {
dev_err(&pdev->dev, "could not request IRQ: %d\n", err); dev_err(&pdev->dev, "could not request IRQ: %d\n", err);
goto out_clk_disable; return err;
} }
err = spi_register_controller(host); err = spi_register_controller(host);
if (err) { if (err) {
dev_err(&pdev->dev, "could not register SPI host: %d\n", 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)); bcm2835aux_debugfs_create(bs, dev_name(&pdev->dev));
return 0; return 0;
out_clk_disable:
clk_disable_unprepare(bs->clk);
return err;
} }
static void bcm2835aux_spi_remove(struct platform_device *pdev) 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); spi_unregister_controller(host);
bcm2835aux_spi_reset_hw(bs); 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[] = { static const struct of_device_id bcm2835aux_spi_match[] = {