mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-29 13:53:33 +00:00
pwm: spear: Simplify using devm functions
With devm_clk_get_prepared() the call to clk_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 spear_pwm_remove() the last user of platform_get_drvdata() is gone and so platform_set_drvdata() can be dropped, too. Also use dev_err_probe() for simplified (and improved) error reporting. Link: https://lore.kernel.org/r/20230929161918.2410424-7-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:
parent
05c9b6f8e5
commit
4f9ab6902b
1 changed files with 11 additions and 29 deletions
|
@ -206,26 +206,21 @@ static int spear_pwm_probe(struct platform_device *pdev)
|
||||||
if (IS_ERR(pc->mmio_base))
|
if (IS_ERR(pc->mmio_base))
|
||||||
return PTR_ERR(pc->mmio_base);
|
return PTR_ERR(pc->mmio_base);
|
||||||
|
|
||||||
pc->clk = devm_clk_get(&pdev->dev, NULL);
|
pc->clk = devm_clk_get_prepared(&pdev->dev, NULL);
|
||||||
if (IS_ERR(pc->clk))
|
if (IS_ERR(pc->clk))
|
||||||
return PTR_ERR(pc->clk);
|
return dev_err_probe(&pdev->dev, PTR_ERR(pc->clk),
|
||||||
|
"Failed to get clock\n");
|
||||||
platform_set_drvdata(pdev, pc);
|
|
||||||
|
|
||||||
pc->chip.dev = &pdev->dev;
|
pc->chip.dev = &pdev->dev;
|
||||||
pc->chip.ops = &spear_pwm_ops;
|
pc->chip.ops = &spear_pwm_ops;
|
||||||
pc->chip.npwm = NUM_PWM;
|
pc->chip.npwm = NUM_PWM;
|
||||||
|
|
||||||
ret = clk_prepare(pc->clk);
|
|
||||||
if (ret)
|
|
||||||
return ret;
|
|
||||||
|
|
||||||
if (of_device_is_compatible(np, "st,spear1340-pwm")) {
|
if (of_device_is_compatible(np, "st,spear1340-pwm")) {
|
||||||
ret = clk_enable(pc->clk);
|
ret = clk_enable(pc->clk);
|
||||||
if (ret) {
|
if (ret)
|
||||||
clk_unprepare(pc->clk);
|
return dev_err_probe(&pdev->dev, ret,
|
||||||
return ret;
|
"Failed to enable clk\n");
|
||||||
}
|
|
||||||
/*
|
/*
|
||||||
* Following enables PWM chip, channels would still be
|
* Following enables PWM chip, channels would still be
|
||||||
* enabled individually through their control register
|
* enabled individually through their control register
|
||||||
|
@ -237,23 +232,11 @@ static int spear_pwm_probe(struct platform_device *pdev)
|
||||||
clk_disable(pc->clk);
|
clk_disable(pc->clk);
|
||||||
}
|
}
|
||||||
|
|
||||||
ret = pwmchip_add(&pc->chip);
|
ret = devm_pwmchip_add(&pdev->dev, &pc->chip);
|
||||||
if (ret < 0) {
|
if (ret < 0)
|
||||||
clk_unprepare(pc->clk);
|
return dev_err_probe(&pdev->dev, ret, "pwmchip_add() failed\n");
|
||||||
dev_err(&pdev->dev, "pwmchip_add() failed: %d\n", ret);
|
|
||||||
}
|
|
||||||
|
|
||||||
return ret;
|
return 0;
|
||||||
}
|
|
||||||
|
|
||||||
static void spear_pwm_remove(struct platform_device *pdev)
|
|
||||||
{
|
|
||||||
struct spear_pwm_chip *pc = platform_get_drvdata(pdev);
|
|
||||||
|
|
||||||
pwmchip_remove(&pc->chip);
|
|
||||||
|
|
||||||
/* clk was prepared in probe, hence unprepare it here */
|
|
||||||
clk_unprepare(pc->clk);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static const struct of_device_id spear_pwm_of_match[] = {
|
static const struct of_device_id spear_pwm_of_match[] = {
|
||||||
|
@ -270,7 +253,6 @@ static struct platform_driver spear_pwm_driver = {
|
||||||
.of_match_table = spear_pwm_of_match,
|
.of_match_table = spear_pwm_of_match,
|
||||||
},
|
},
|
||||||
.probe = spear_pwm_probe,
|
.probe = spear_pwm_probe,
|
||||||
.remove_new = spear_pwm_remove,
|
|
||||||
};
|
};
|
||||||
|
|
||||||
module_platform_driver(spear_pwm_driver);
|
module_platform_driver(spear_pwm_driver);
|
||||||
|
|
Loading…
Reference in a new issue