Hello Paul, first of all, your mail is strange. I think the problem is that it doesn't contain a Message-Id. The result is that I got it twice and in return vger.kernel.org seems to have refused to take it. At least it's neither in lore.kernel.org nor in https://patchwork.ozlabs.org/project/linux-pwm/patch/20230629094839.757092-4-u.kleine-koenig@xxxxxxxxxxxxxx/ . On Thu, Jun 29, 2023 at 01:12:25PM +0200, Paul Cercueil wrote: > Le 29 juin 2023 11:48, Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx> a écrit : > > > > Stop using chip_data which is about to go away. Instead track the > > per-channel clk in struct jz4740_pwm_chip. > > > > Signed-off-by: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx> > > --- > > drivers/pwm/pwm-jz4740.c | 11 +++++++---- > > 1 file changed, 7 insertions(+), 4 deletions(-) > > > > diff --git a/drivers/pwm/pwm-jz4740.c b/drivers/pwm/pwm-jz4740.c > > index 3b7067f6cd0d..e0a57d71a60c 100644 > > --- a/drivers/pwm/pwm-jz4740.c > > +++ b/drivers/pwm/pwm-jz4740.c > > @@ -27,6 +27,7 @@ struct soc_info { > > struct jz4740_pwm_chip { > > struct pwm_chip chip; > > struct regmap *map; > > + struct clk *clk[]; > > }; > > > > static inline struct jz4740_pwm_chip *to_jz4740(struct pwm_chip *chip) > > @@ -70,14 +71,15 @@ static int jz4740_pwm_request(struct pwm_chip *chip, struct pwm_device *pwm) > > return err; > > } > > > > - pwm_set_chip_data(pwm, clk); > > + jz->clk[pwm->hwpwm] = clk; > > > > return 0; > > } > > > > static void jz4740_pwm_free(struct pwm_chip *chip, struct pwm_device *pwm) > > { > > - struct clk *clk = pwm_get_chip_data(pwm); > > + struct jz4740_pwm_chip *jz = to_jz4740(chip); > > + struct clk *clk = jz->clk[pwm->hwpwm]; > > > > clk_disable_unprepare(clk); > > clk_put(clk); > > @@ -123,7 +125,7 @@ static int jz4740_pwm_apply(struct pwm_chip *chip, struct pwm_device *pwm, > > { > > struct jz4740_pwm_chip *jz4740 = to_jz4740(pwm->chip); > > unsigned long long tmp = 0xffffull * NSEC_PER_SEC; > > - struct clk *clk = pwm_get_chip_data(pwm); > > + struct clk *clk = jz4740->clk[pwm->hwpwm]; > > unsigned long period, duty; > > long rate; > > int err; > > @@ -229,7 +231,8 @@ static int jz4740_pwm_probe(struct platform_device *pdev) > > if (!info) > > return -EINVAL; > > > > - jz4740 = devm_kzalloc(dev, sizeof(*jz4740), GFP_KERNEL); > > + jz4740 = devm_kzalloc(dev, sizeof(*jz4740) + info->num_pwms * sizeof(jz4740->clk[0]), > > + GFP_KERNEL); > > LGTM, but please use struct_size() from <linux/overflow.h>. Ah, I thought there is such a macro, but I didn't find it neither by grepping nor by asking in #kernelnewbies. Thanks, will respin the series in a few days. Best regards Uwe -- Pengutronix e.K. | Uwe Kleine-König | Industrial Linux Solutions | https://www.pengutronix.de/ |
Attachment:
signature.asc
Description: PGP signature
