]> git.itanic.dy.fi Git - linux-stable/commitdiff
pwm: tegra: Don't modify HW state in .remove callback
authorUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Thu, 17 Jun 2021 09:51:41 +0000 (11:51 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 20 Jul 2021 14:17:52 +0000 (16:17 +0200)
[ Upstream commit 86f7fa71cd830d18d7ebcaf719dffd5ddfe1acdd ]

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.

So drop the hardware modification from the .remove() callback.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Thierry Reding <thierry.reding@gmail.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/pwm/pwm-tegra.c

index f8ebbece57b71ad5f03501304b8144b1341cbe7f..6be14e0f1dc34e319b1e6a1618bd5ea5ef9450cb 100644 (file)
@@ -245,7 +245,6 @@ static int tegra_pwm_probe(struct platform_device *pdev)
 static int tegra_pwm_remove(struct platform_device *pdev)
 {
        struct tegra_pwm_chip *pc = platform_get_drvdata(pdev);
-       unsigned int i;
        int err;
 
        if (WARN_ON(!pc))
@@ -255,18 +254,6 @@ static int tegra_pwm_remove(struct platform_device *pdev)
        if (err < 0)
                return err;
 
-       for (i = 0; i < pc->chip.npwm; i++) {
-               struct pwm_device *pwm = &pc->chip.pwms[i];
-
-               if (!pwm_is_enabled(pwm))
-                       if (clk_prepare_enable(pc->clk) < 0)
-                               continue;
-
-               pwm_writel(pc, i, 0);
-
-               clk_disable_unprepare(pc->clk);
-       }
-
        reset_control_assert(pc->rst);
        clk_disable_unprepare(pc->clk);