pwm: Move the enabled/disabled info into pwm_state

Prepare the transition to PWM atomic update by moving the enabled and
disabled state into the pwm_state struct. This way we can easily update
the whole PWM state by copying the new state in the ->state field.

Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
Signed-off-by: Thierry Reding <thierry.reding@gmail.com>

1 files changed, 9 insertions, 4 deletions

diff --git a/drivers/pwm/core.c b/drivers/pwm/core.c
index f3f91e716a42..c240b5437145 100644
--- a/drivers/pwm/core.c
+++ b/drivers/pwm/core.c
@@ -499,10 +499,10 @@ int pwm_enable(struct pwm_device *pwm)
         if (!pwm)
                 return -EINVAL;
 
-        if (!test_and_set_bit(PWMF_ENABLED, &pwm->flags)) {
+        if (!pwm_is_enabled(pwm)) {
                 err = pwm->chip->ops->enable(pwm->chip, pwm);
-                if (err)
-                        clear_bit(PWMF_ENABLED, &pwm->flags);
+                if (!err)
+                        pwm->state.enabled = true;
         }
 
         return err;
@@ -515,8 +515,13 @@ EXPORT_SYMBOL_GPL(pwm_enable);
  */
 void pwm_disable(struct pwm_device *pwm)
 {
-        if (pwm && test_and_clear_bit(PWMF_ENABLED, &pwm->flags))
+        if (!pwm)
+                return;
+
+        if (pwm_is_enabled(pwm)) {
                 pwm->chip->ops->disable(pwm->chip, pwm);
+                pwm->state.enabled = false;
+        }
 }
 EXPORT_SYMBOL_GPL(pwm_disable);