Commit b22d3230 authored by Uwe Kleine-König's avatar Uwe Kleine-König Committed by Zheng Zengkai
Browse files

pwm: img: Don't modify HW state in .remove() callback 

stable inclusion
from stable-5.10.69
commit 0a2ea5c0e5d1076fc189f695f18f6341f58f469d
bugzilla: 182675 https://gitee.com/openeuler/kernel/issues/I4I3ED

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=0a2ea5c0e5d1076fc189f695f18f6341f58f469d



--------------------------------

[ Upstream commit c68eb29c ]

A consumer is expected to disable a PWM before calling pwm_put(). And if
they didn't there is hopefully a good reason (or the consumer needs
fixing). Also if disabling an enabled PWM was the right thing to do,
this should better be done in the framework instead of in each low level
driver.

Signed-off-by: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: default avatarThierry Reding <thierry.reding@gmail.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
Signed-off-by: default avatarChen Jun <chenjun102@huawei.com>
Acked-by: default avatarWeilong Chen <chenweilong@huawei.com>

Signed-off-by: default avatarChen Jun <chenjun102@huawei.com>
Signed-off-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
parent 991cf553

drivers/pwm/pwm-img.c

+0 −16
Original line number Diff line number Diff line
@@ -329,23 +329,7 @@ static int img_pwm_probe(struct platform_device *pdev) 
static int img_pwm_remove(struct platform_device *pdev)

{

	struct img_pwm_chip *pwm_chip = platform_get_drvdata(pdev);

	u32 val;

	unsigned int i;

	int ret;



	ret = pm_runtime_get_sync(&pdev->dev);

	if (ret < 0) {

		pm_runtime_put(&pdev->dev);

		return ret;

	}



	for (i = 0; i < pwm_chip->chip.npwm; i++) {

		val = img_pwm_readl(pwm_chip, PWM_CTRL_CFG);

		val &= ~BIT(i);

		img_pwm_writel(pwm_chip, PWM_CTRL_CFG, val);

	}



	pm_runtime_put(&pdev->dev);

	pm_runtime_disable(&pdev->dev);

	if (!pm_runtime_status_suspended(&pdev->dev))

		img_pwm_runtime_suspend(&pdev->dev);