OSDN Git Service

media: rc: pwm-ir-tx: Switch to atomic PWM API
authorMaíra Canal <maira.canal@usp.br>
Wed, 27 Oct 2021 15:34:30 +0000 (16:34 +0100)
committerMauro Carvalho Chehab <mchehab+huawei@kernel.org>
Mon, 15 Nov 2021 08:29:05 +0000 (08:29 +0000)
Remove legacy PWM interface (pwm_config, pwm_enable, pwm_disable) and
replace it for the atomic PWM API.

Signed-off-by: Maíra Canal <maira.canal@usp.br>
Acked-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Sean Young <sean@mess.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
drivers/media/rc/pwm-ir-tx.c

index 4bc28d2..105a9c2 100644 (file)
@@ -53,22 +53,21 @@ static int pwm_ir_tx(struct rc_dev *dev, unsigned int *txbuf,
 {
        struct pwm_ir *pwm_ir = dev->priv;
        struct pwm_device *pwm = pwm_ir->pwm;
-       int i, duty, period;
+       struct pwm_state state;
+       int i;
        ktime_t edge;
        long delta;
 
-       period = DIV_ROUND_CLOSEST(NSEC_PER_SEC, pwm_ir->carrier);
-       duty = DIV_ROUND_CLOSEST(pwm_ir->duty_cycle * period, 100);
+       pwm_init_state(pwm, &state);
 
-       pwm_config(pwm, duty, period);
+       state.period = DIV_ROUND_CLOSEST(NSEC_PER_SEC, pwm_ir->carrier);
+       pwm_set_relative_duty_cycle(&state, pwm_ir->duty_cycle, 100);
 
        edge = ktime_get();
 
        for (i = 0; i < count; i++) {
-               if (i % 2) // space
-                       pwm_disable(pwm);
-               else
-                       pwm_enable(pwm);
+               state.enabled = !(i % 2);
+               pwm_apply_state(pwm, &state);
 
                edge = ktime_add_us(edge, txbuf[i]);
                delta = ktime_us_delta(edge, ktime_get());
@@ -76,7 +75,8 @@ static int pwm_ir_tx(struct rc_dev *dev, unsigned int *txbuf,
                        usleep_range(delta, delta + 10);
        }
 
-       pwm_disable(pwm);
+       state.enabled = false;
+       pwm_apply_state(pwm, &state);
 
        return count;
 }