nagai/kernel
3
0
Fork 0
forked from mirrors/linux
Code Pull requests Activity

pwm: bcm2835: Simplify using devm functions

Browse source 
With devm_clk_get_enabled() the call to clk_disable_unprepare() can be
dropped from the error path and the remove callback. With
devm_pwmchip_add() pwmchip_remove() can be dropped. Then the remove
callback is empty and can go away, too. With bcm2835_pwm_remove() the only
user of platform_get_drvdata() is gone and so platform_set_drvdata() can
be dropped from .probe(), too.

Also use dev_err_probe() for simplified (and improved) error reporting.

Link: https://lore.kernel.org/r/20230929161918.2410424-3-u.kleine-koenig@pengutronix.de
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Thierry Reding <thierry.reding@gmail.com>
This commit is contained in:
Uwe Kleine-König 2023-09-29 18:19:09 +02:00 committed by Thierry Reding
parent b498c14efd
commit 2ce7b7f670
1 changed files with 4 additions and 23 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

27
drivers/pwm/pwm-bcm2835.c
View file

@ -146,39 +146,21 @@ static int bcm2835_pwm_probe(struct platform_device *pdev)
if (IS_ERR(pc->base)) if (IS_ERR(pc->base))
return PTR_ERR(pc->base); return PTR_ERR(pc->base);
pc->clk = devm_clk_get(&pdev->dev, NULL); pc->clk = devm_clk_get_enabled(&pdev->dev, NULL);
if (IS_ERR(pc->clk)) if (IS_ERR(pc->clk))
return dev_err_probe(&pdev->dev, PTR_ERR(pc->clk), return dev_err_probe(&pdev->dev, PTR_ERR(pc->clk),
"clock not found\n"); "clock not found\n");
ret = clk_prepare_enable(pc->clk);
if (ret)
return ret;
pc->chip.dev = &pdev->dev; pc->chip.dev = &pdev->dev;
pc->chip.ops = &bcm2835_pwm_ops; pc->chip.ops = &bcm2835_pwm_ops;
pc->chip.npwm = 2; pc->chip.npwm = 2;
platform_set_drvdata(pdev, pc); ret = devm_pwmchip_add(&pdev->dev, &pc->chip);
ret = pwmchip_add(&pc->chip);
if (ret < 0) if (ret < 0)
goto add_fail; return dev_err_probe(&pdev->dev, ret,
"failed to add pwmchip\n");
return 0; return 0;
add_fail:
clk_disable_unprepare(pc->clk);
return ret;
}
static void bcm2835_pwm_remove(struct platform_device *pdev)
{
struct bcm2835_pwm *pc = platform_get_drvdata(pdev);
pwmchip_remove(&pc->chip);
clk_disable_unprepare(pc->clk);
} }
static const struct of_device_id bcm2835_pwm_of_match[] = { static const struct of_device_id bcm2835_pwm_of_match[] = {
@ -193,7 +175,6 @@ static struct platform_driver bcm2835_pwm_driver = {
.of_match_table = bcm2835_pwm_of_match, .of_match_table = bcm2835_pwm_of_match,
}, },
.probe = bcm2835_pwm_probe, .probe = bcm2835_pwm_probe,
.remove_new = bcm2835_pwm_remove,
}; };
module_platform_driver(bcm2835_pwm_driver); module_platform_driver(bcm2835_pwm_driver);