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

pwm: rockchip: Unprepare clocks 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 rockchip_pwm_remove() a bit simpler and allows to eventually
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-rockchip.c b/drivers/pwm/pwm-rockchip.c
index 8fcef29948d77..f3647b3171522 100644
--- a/drivers/pwm/pwm-rockchip.c
+++ b/drivers/pwm/pwm-rockchip.c
@@ -384,10 +384,12 @@ static int rockchip_pwm_remove(struct platform_device *pdev)
 {
 	struct rockchip_pwm_chip *pc = platform_get_drvdata(pdev);
 
+	pwmchip_remove(&pc->chip);
+
 	clk_unprepare(pc->pclk);
 	clk_unprepare(pc->clk);
 
-	return pwmchip_remove(&pc->chip);
+	return 0;
 }
 
 static struct platform_driver rockchip_pwm_driver = {