Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ed60d2db authored by Uwe Kleine-König's avatar Uwe Kleine-König Committed by Greg Kroah-Hartman
Browse files

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



[ Upstream commit c68eb29c8e9067c08175dd0414f6984f236f719d ]

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>
parent b16f4acf

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);