]> git.proxmox.com Git - mirror_ubuntu-hirsute-kernel.git/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)
committerStefan Bader <stefan.bader@canonical.com>
Mon, 20 Sep 2021 13:40:09 +0000 (15:40 +0200)
BugLink: https://bugs.launchpad.net/bugs/1939738
[ 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>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
drivers/pwm/pwm-tegra.c

index 55bc63d5a0ae1df87820e91728cdaa9fed1d5343..6d8e324864fa77475e89961eada99448b858b3ef 100644 (file)
@@ -301,7 +301,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))
@@ -311,18 +310,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);