[PATCH v5 36/46] input: misc: max77693: switch to the atomic API

[Boris Brezillon]

pwm_config/enable/disable() have been deprecated and should be replaced
by pwm_apply_state().

Signed-off-by: Boris Brezillon <boris.brezillon at free-electrons.com>
---
 drivers/input/misc/max77693-haptic.c | 23 +++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/drivers/input/misc/max77693-haptic.c 
b/drivers/input/misc/max77693-haptic.c
index cf6aac0..aef7dc4 100644
--- a/drivers/input/misc/max77693-haptic.c
+++ b/drivers/input/misc/max77693-haptic.c
@@ -70,13 +70,16 @@ struct max77693_haptic {

 static int max77693_haptic_set_duty_cycle(struct max77693_haptic *haptic)
 {
+       struct pwm_state pstate;
        struct pwm_args pargs = { };
-       int delta;
        int error;

        pwm_get_args(haptic->pwm_dev, &pargs);
-       delta = (pargs.period + haptic->pwm_duty) / 2;
-       error = pwm_config(haptic->pwm_dev, delta, pargs.period);
+       pwm_get_state(haptic->pwm_dev, &pstate);
+
+       pstate.period = pargs.period;
+       pstate.duty_cycle = (pargs.period + haptic->pwm_duty) / 2;
+       error = pwm_apply_state(haptic->pwm_dev, &pstate);
        if (error) {
                dev_err(haptic->dev, "failed to configure pwm: %d\n", error);
                return error;
@@ -161,12 +164,16 @@ static int max77693_haptic_lowsys(struct max77693_haptic 
*haptic, bool enable)

 static void max77693_haptic_enable(struct max77693_haptic *haptic)
 {
+       struct pwm_state pstate;
        int error;

        if (haptic->enabled)
                return;

-       error = pwm_enable(haptic->pwm_dev);
+       pwm_get_state(haptic->pwm_dev, &pstate);
+       pstate.enabled = true;
+
+       error = pwm_apply_state(haptic->pwm_dev, &pstate);
        if (error) {
                dev_err(haptic->dev,
                        "failed to enable haptic pwm device: %d\n", error);
@@ -188,11 +195,13 @@ static void max77693_haptic_enable(struct max77693_haptic 
*haptic)
 err_enable_config:
        max77693_haptic_lowsys(haptic, false);
 err_enable_lowsys:
-       pwm_disable(haptic->pwm_dev);
+       pstate.enabled = false;
+       pwm_apply_state(haptic->pwm_dev, &pstate);
 }

 static void max77693_haptic_disable(struct max77693_haptic *haptic)
 {
+       struct pwm_state pstate;
        int error;

        if (!haptic->enabled)
@@ -206,7 +215,9 @@ static void max77693_haptic_disable(struct max77693_haptic 
*haptic)
        if (error)
                goto err_disable_lowsys;

-       pwm_disable(haptic->pwm_dev);
+       pwm_get_state(haptic->pwm_dev, &pstate);
+       pstate.enabled = false;
+       pwm_apply_state(haptic->pwm_dev, &pstate);
        haptic->enabled = false;

        return;
-- 
2.5.0