2021-10-23 18:32:48

by Maíra Canal

Subject: [PATCH v2] media: rc: pwm-ir-tx: Switch to atomic PWM API

Remove legacy PWM interface (pwm_config, pwm_enable, pwm_disable) and
replace it for the atomic PWM API.

Signed-off-by: Ma?ra Canal <[email protected]>
---
V1 -> V2: Assign variables directly and simplify conditional statement
---
drivers/media/rc/pwm-ir-tx.c | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/drivers/media/rc/pwm-ir-tx.c b/drivers/media/rc/pwm-ir-tx.c
index 4bc28d2c9cc9..ca943f168855 100644
--- a/drivers/media/rc/pwm-ir-tx.c
+++ b/drivers/media/rc/pwm-ir-tx.c
@@ -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);
+ state.duty_cycle = DIV_ROUND_CLOSEST(pwm_ir->duty_cycle * period, 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;
}
--
2.31.1

2021-10-24 07:27:22

by Sean Young

Subject: Re: [PATCH v2] media: rc: pwm-ir-tx: Switch to atomic PWM API

On Sat, Oct 23, 2021 at 03:20:42PM -0300, Ma?ra Canal wrote:
> Remove legacy PWM interface (pwm_config, pwm_enable, pwm_disable) and
> replace it for the atomic PWM API.
>
> Signed-off-by: Ma?ra Canal <[email protected]>
> ---
> V1 -> V2: Assign variables directly and simplify conditional statement
> ---
> drivers/media/rc/pwm-ir-tx.c | 18 +++++++++---------
> 1 file changed, 9 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/media/rc/pwm-ir-tx.c b/drivers/media/rc/pwm-ir-tx.c
> index 4bc28d2c9cc9..ca943f168855 100644
> --- a/drivers/media/rc/pwm-ir-tx.c
> +++ b/drivers/media/rc/pwm-ir-tx.c
> @@ -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);
> + state.duty_cycle = DIV_ROUND_CLOSEST(pwm_ir->duty_cycle * period, 100);

That doesn't compile.


Sean

>
> 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;
> }
> --
> 2.31.1