Message ID | 20210428090526.29016-3-u.kleine-koenig@pengutronix.de |
---|---|
State | Accepted |
Headers | show |
Series | [v2,1/3] pwm: spear: Don't modify HW state in .remove callback | expand |
diff --git a/drivers/pwm/pwm-spear.c b/drivers/pwm/pwm-spear.c index 6879b49581b3..05a19e70d570 100644 --- a/drivers/pwm/pwm-spear.c +++ b/drivers/pwm/pwm-spear.c @@ -229,9 +229,12 @@ static int 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); - return pwmchip_remove(&pc->chip); + + return 0; } static const struct of_device_id spear_pwm_of_match[] = {
Before pwmchip_remove() returns the PWM is expected to be functional. So remove the pwmchip before disabling the clocks. The check for pwmchip_remove()'s return value is dropped as this function returns effectively always 0 and returning an error in a remove callback is useless anyhow (as the device core ignores it and drops devm allocated resources). Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> --- drivers/pwm/pwm-spear.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)