On Wed, 06 Dec 2023, Uwe Kleine-König wrote: > This prepares the pwm sub-driver to further changes of the pwm core > outlined in the commit introducing devm_pwmchip_alloc(). There is no > intended semantical change and the driver should behave as before. > > Signed-off-by: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx> > --- > drivers/leds/rgb/leds-qcom-lpg.c | 16 ++++++++++------ > 1 file changed, 10 insertions(+), 6 deletions(-) Acked-by: Lee Jones <lee@xxxxxxxxxx> > diff --git a/drivers/leds/rgb/leds-qcom-lpg.c b/drivers/leds/rgb/leds-qcom-lpg.c > index 156b73d1f4a2..0a7acf59a420 100644 > --- a/drivers/leds/rgb/leds-qcom-lpg.c > +++ b/drivers/leds/rgb/leds-qcom-lpg.c > @@ -77,7 +77,7 @@ struct lpg { > > struct mutex lock; > > - struct pwm_chip pwm; > + struct pwm_chip *pwm; > > const struct lpg_data *data; > > @@ -978,7 +978,7 @@ static int lpg_pattern_mc_clear(struct led_classdev *cdev) > > static inline struct lpg *lpg_pwm_from_chip(struct pwm_chip *chip) > { > - return container_of(chip, struct lpg, pwm); > + return pwmchip_get_drvdata(chip); > } > > static int lpg_pwm_request(struct pwm_chip *chip, struct pwm_device *pwm) > @@ -1093,13 +1093,17 @@ static const struct pwm_ops lpg_pwm_ops = { > > static int lpg_add_pwm(struct lpg *lpg) > { > + struct pwm_chip *chip; > int ret; > > - lpg->pwm.dev = lpg->dev; > - lpg->pwm.npwm = lpg->num_channels; > - lpg->pwm.ops = &lpg_pwm_ops; > + lpg->pwm = chip = devm_pwmchip_alloc(lpg->dev, lpg->num_channels, 0); > + if (IS_ERR(chip)) > + return PTR_ERR(chip); > > - ret = devm_pwmchip_add(lpg->dev, &lpg->pwm); > + chip->ops = &lpg_pwm_ops; > + pwmchip_set_drvdata(chip, lpg); > + > + ret = devm_pwmchip_add(lpg->dev, chip); > if (ret) > dev_err_probe(lpg->dev, ret, "failed to add PWM chip\n"); > > -- > 2.42.0 > -- Lee Jones [李琼斯]