From: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Date: Wed, 7 Jul 2021 16:27:56 +0000 (+0200)
Subject: pwm: tiehrpwm: Unprepare clock only after the PWM was unregistered
X-Git-Tag: v5.15-rc1~23^2~44
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1a0c97b6460f30d8b164eaef07d77369e466dda3;p=thirdparty%2Fkernel%2Flinux.git

pwm: tiehrpwm: Unprepare clock only after the PWM was unregistered

The driver is supposed to stay functional until pwmchip_remove()
returns. So disable clocks only after that.

pwmchip_remove() always returns 0, so the return code can be ignored
which keeps ehrpwm_pwm_remove() a bit simpler and eventually allows to
make pwmchip_remove() return void.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Thierry Reding <thierry.reding@gmail.com>
---

diff --git a/drivers/pwm/pwm-tiehrpwm.c b/drivers/pwm/pwm-tiehrpwm.c
index 17909fa532113..5b723a48c5f1d 100644
--- a/drivers/pwm/pwm-tiehrpwm.c
+++ b/drivers/pwm/pwm-tiehrpwm.c
@@ -485,11 +485,13 @@ static int ehrpwm_pwm_remove(struct platform_device *pdev)
 {
 	struct ehrpwm_pwm_chip *pc = platform_get_drvdata(pdev);
 
+	pwmchip_remove(&pc->chip);
+
 	clk_unprepare(pc->tbclk);
 
 	pm_runtime_disable(&pdev->dev);
 
-	return pwmchip_remove(&pc->chip);
+	return 0;
 }
 
 #ifdef CONFIG_PM_SLEEP