media: ir-rx51: Switch to atomic PWM API
Subsystems (3)
PATCH v2 1/1 media: ir-rx51: Switch to atomic PWM API
Remove legacy PWM interface (pwm_config, pwm_enable, pwm_disable) and replace it for the atomic PWM API.
---
V1 -> V2: remove conceptually wrong chunk of code and correct the position of pwm_init_state function
--- drivers/media/rc/ir-rx51.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-)
drivers/media/rc/ir-rx51.c +9 -7
@@ -19,6 +19,7 @@struct ir_rx51 {struct rc_dev *rcdev;struct pwm_device *pwm; +struct pwm_state *state;struct hrtimer timer;struct device *dev;wait_queue_head_t wqueue;
@@ -32,22 +33,22 @@ struct ir_rx51 {static inline void ir_rx51_on (struct ir_rx51 *ir_rx51) { -pwm_enable (ir_rx51->pwm); + ir_rx51->state->enabled = true; +pwm_apply_state (ir_rx51->pwm, ir_rx51->state); }static inline void ir_rx51_off (struct ir_rx51 *ir_rx51) { -pwm_disable (ir_rx51->pwm); + ir_rx51->state->enabled = false; +pwm_apply_state (ir_rx51->pwm, ir_rx51->state); }static int init_timing_params (struct ir_rx51 *ir_rx51) { -struct pwm_device *pwm = ir_rx51->pwm; -int duty, period =DIV_ROUND_CLOSEST (NSEC_PER_SEC , ir_rx51->freq); +struct pwm_state *state = ir_rx51->state; - duty =DIV_ROUND_CLOSEST (ir_rx51->duty_cycle * period,100 ); - -pwm_config (pwm, duty, period); + state->period =DIV_ROUND_CLOSEST (NSEC_PER_SEC , ir_rx51->freq); +pwm_set_relative_duty_cycle (state, ir_rx51->duty_cycle,100 );return 0 ; }
@@ -242,6 +243,7 @@ static int ir_rx51_probe(struct platform_device *dev)/* Use default, in case userspace does not set the carrier */ ir_rx51.freq =DIV_ROUND_CLOSEST_ULL (pwm_get_period (pwm),NSEC_PER_SEC ); +pwm_init_state (pwm, ir_rx51.state);pwm_put (pwm);hrtimer_init (&ir_rx51.timer,CLOCK_MONOTONIC ,HRTIMER_MODE_REL );
Signature · 1 line
2.31.1
Quoted 54 lines · Maíra Canal
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: remove conceptually wrong chunk of code and correct the position ofpwm_init_statefunction--- drivers/media/rc/ir-rx51.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-)drivers/media/rc/ir-rx51.c +8
-7@@ -19,6 +19,7 @@struct ir_rx51 {struct rc_dev *rcdev;struct pwm_device *pwm; +struct pwm_state *state;struct hrtimer timer;struct device *dev;wait_queue_head_t wqueue;@@ -32,22 +33,22 @@ struct ir_rx51 {static inline void ir_rx51_on (struct ir_rx51 *ir_rx51) { -pwm_enable (ir_rx51->pwm); + ir_rx51->state->enabled = true; +pwm_apply_state (ir_rx51->pwm, ir_rx51->state); }static inline void ir_rx51_off (struct ir_rx51 *ir_rx51) { -pwm_disable (ir_rx51->pwm); + ir_rx51->state->enabled = false; +pwm_apply_state (ir_rx51->pwm, ir_rx51->state); }static int init_timing_params (struct ir_rx51 *ir_rx51) { -struct pwm_device *pwm = ir_rx51->pwm; -int duty, period =DIV_ROUND_CLOSEST (NSEC_PER_SEC , ir_rx51->freq); +struct pwm_state *state = ir_rx51->state; - duty =DIV_ROUND_CLOSEST (ir_rx51->duty_cycle * period,100 ); - -pwm_config (pwm, duty, period); + state->period =DIV_ROUND_CLOSEST (NSEC_PER_SEC , ir_rx51->freq); +pwm_set_relative_duty_cycle (state, ir_rx51->duty_cycle,100 );return 0 ; }
drivers/media/rc/ir-rx51.c static int ir_rx51_probe(struct platform_device *dev) · line 248
Quoted 6 lines
drivers/media/rc/ir-rx51.c +1
-0@@ -242,6 +243,7 @@ static int ir_rx51_probe(struct platform_device *dev)/* Use default, in case userspace does not set the carrier */ ir_rx51.freq =DIV_ROUND_CLOSEST_ULL (pwm_get_period (pwm),NSEC_PER_SEC ); +pwm_init_state (pwm, ir_rx51.state);pwm_put (pwm);
Orthogonal to this patch I wonder why probe calls pwm_get() and pwm_put(), just to have another call to pwm_get() in the open callback.
Quoted 5 lines
drivers/media/rc/ir-rx51.c +0
-0hrtimer_init (&ir_rx51.timer,CLOCK_MONOTONIC ,HRTIMER_MODE_REL );Signature · 1 line
2.31.1
Signature · 2 lines
Pengutronix e.K. | Uwe Kleine-König | Industrial Linux Solutions | https://www.pengutronix.de/ |
Quoted 65 lines · Uwe Kleine-König
Quoted 54 lines · Maíra Canal
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: remove conceptually wrong chunk of code and correct the position ofpwm_init_statefunction--- drivers/media/rc/ir-rx51.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-)drivers/media/rc/ir-rx51.c +8
-7@@ -19,6 +19,7 @@struct ir_rx51 {struct rc_dev *rcdev;struct pwm_device *pwm; +struct pwm_state *state;struct hrtimer timer;struct device *dev;wait_queue_head_t wqueue;@@ -32,22 +33,22 @@ struct ir_rx51 {static inline void ir_rx51_on (struct ir_rx51 *ir_rx51) { -pwm_enable (ir_rx51->pwm); + ir_rx51->state->enabled = true; +pwm_apply_state (ir_rx51->pwm, ir_rx51->state); }static inline void ir_rx51_off (struct ir_rx51 *ir_rx51) { -pwm_disable (ir_rx51->pwm); + ir_rx51->state->enabled = false; +pwm_apply_state (ir_rx51->pwm, ir_rx51->state); }static int init_timing_params (struct ir_rx51 *ir_rx51) { -struct pwm_device *pwm = ir_rx51->pwm; -int duty, period =DIV_ROUND_CLOSEST (NSEC_PER_SEC , ir_rx51->freq); +struct pwm_state *state = ir_rx51->state; - duty =DIV_ROUND_CLOSEST (ir_rx51->duty_cycle * period,100 ); - -pwm_config (pwm, duty, period); + state->period =DIV_ROUND_CLOSEST (NSEC_PER_SEC , ir_rx51->freq); +pwm_set_relative_duty_cycle (state, ir_rx51->duty_cycle,100 );return 0 ; }drivers/media/rc/ir-rx51.c static int ir_rx51_probe(struct platform_device *dev) · line 248
Quoted 6 lines
drivers/media/rc/ir-rx51.c +1
-0@@ -242,6 +243,7 @@ static int ir_rx51_probe(struct platform_device *dev)/* Use default, in case userspace does not set the carrier */ ir_rx51.freq =DIV_ROUND_CLOSEST_ULL (pwm_get_period (pwm),NSEC_PER_SEC ); +pwm_init_state (pwm, ir_rx51.state);pwm_put (pwm);Orthogonal to this patch I wonder why probe calls
pwm_get()andpwm_put(), just to have another call topwm_get()in the open callback.
Quoted 1 line
Reviewed-by Uwe Kleine-König <[email protected]>
Oh, I missed something: the member added to struct ir_rx51 must be a plain struct pwm_state, not a pointer to it. As suggested here the driver runs into a NULL pointer exception.
Best regards
Uwe
Signature · 2 lines
Pengutronix e.K. | Uwe Kleine-König | Industrial Linux Solutions | https://www.pengutronix.de/ |