| Message ID | 20231121134901.208535-71-u.kleine-koenig@pengutronix.de |
|---|---|
| State | Superseded |
| Headers | show |
| Series | pwm: Fix lifetime issues for pwm_chips | expand |
On Tue, Nov 21, 2023 at 02:50:12PM +0100, Uwe Kleine-König wrote: > This prepares the pwm-microchip-core 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@pengutronix.de> > --- > drivers/pwm/pwm-microchip-core.c | 17 ++++++++--------- > 1 file changed, 8 insertions(+), 9 deletions(-) > > diff --git a/drivers/pwm/pwm-microchip-core.c b/drivers/pwm/pwm-microchip-core.c > index c0c53968f3e9..6e0c2cbfc120 100644 > --- a/drivers/pwm/pwm-microchip-core.c > +++ b/drivers/pwm/pwm-microchip-core.c > @@ -54,7 +54,6 @@ > #define MCHPCOREPWM_TIMEOUT_MS 100u > > struct mchp_core_pwm_chip { > - struct pwm_chip chip; > struct clk *clk; > void __iomem *base; > struct mutex lock; /* protects the shared period */ > @@ -65,7 +64,7 @@ struct mchp_core_pwm_chip { > > static inline struct mchp_core_pwm_chip *to_mchp_core_pwm(struct pwm_chip *chip) > { > - return container_of(chip, struct mchp_core_pwm_chip, chip); > + return pwmchip_priv(chip); > } I know this is likely a coccinelle job, but can we now delete things like to_mchp_core_pwm() if there's a standard helper for this now? Acked-by: Conor Dooley <conor.dooley@microchip.com> Cheers, Conor. > static void mchp_core_pwm_enable(struct pwm_chip *chip, struct pwm_device *pwm, > @@ -447,13 +446,15 @@ MODULE_DEVICE_TABLE(of, mchp_core_of_match); > > static int mchp_core_pwm_probe(struct platform_device *pdev) > { > + struct pwm_chip *chip; > struct mchp_core_pwm_chip *mchp_core_pwm; > struct resource *regs; > int ret; > > - mchp_core_pwm = devm_kzalloc(&pdev->dev, sizeof(*mchp_core_pwm), GFP_KERNEL); > - if (!mchp_core_pwm) > - return -ENOMEM; > + chip = devm_pwmchip_alloc(&pdev->dev, 16, sizeof(*mchp_core_pwm)); > + if (IS_ERR(chip)) > + return PTR_ERR(chip); > + mchp_core_pwm = to_mchp_core_pwm(chip); > > mchp_core_pwm->base = devm_platform_get_and_ioremap_resource(pdev, 0, ®s); > if (IS_ERR(mchp_core_pwm->base)) > @@ -470,9 +471,7 @@ static int mchp_core_pwm_probe(struct platform_device *pdev) > > mutex_init(&mchp_core_pwm->lock); > > - mchp_core_pwm->chip.dev = &pdev->dev; > - mchp_core_pwm->chip.ops = &mchp_core_pwm_ops; > - mchp_core_pwm->chip.npwm = 16; > + chip->ops = &mchp_core_pwm_ops; > > mchp_core_pwm->channel_enabled = readb_relaxed(mchp_core_pwm->base + MCHPCOREPWM_EN(0)); > mchp_core_pwm->channel_enabled |= > @@ -485,7 +484,7 @@ static int mchp_core_pwm_probe(struct platform_device *pdev) > writel_relaxed(1U, mchp_core_pwm->base + MCHPCOREPWM_SYNC_UPD); > mchp_core_pwm->update_timestamp = ktime_get(); > > - ret = devm_pwmchip_add(&pdev->dev, &mchp_core_pwm->chip); > + ret = devm_pwmchip_add(&pdev->dev, chip); > if (ret) > return dev_err_probe(&pdev->dev, ret, "Failed to add pwmchip\n"); > > -- > 2.42.0 > > > _______________________________________________ > linux-riscv mailing list > linux-riscv@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/linux-riscv
Hello Conor, On Wed, Nov 22, 2023 at 11:14:21AM +0000, Conor Dooley wrote: > On Tue, Nov 21, 2023 at 02:50:12PM +0100, Uwe Kleine-König wrote: > > @@ -65,7 +64,7 @@ struct mchp_core_pwm_chip { > > > > static inline struct mchp_core_pwm_chip *to_mchp_core_pwm(struct pwm_chip *chip) > > { > > - return container_of(chip, struct mchp_core_pwm_chip, chip); > > + return pwmchip_priv(chip); > > } > > I know this is likely a coccinelle job, but can we now delete things > like to_mchp_core_pwm() if there's a standard helper for this now? An upside of keeping this helper is that it yields the right type. pwmchip_priv() returns a void *. Best regards Uwe
diff --git a/drivers/pwm/pwm-microchip-core.c b/drivers/pwm/pwm-microchip-core.c index c0c53968f3e9..6e0c2cbfc120 100644 --- a/drivers/pwm/pwm-microchip-core.c +++ b/drivers/pwm/pwm-microchip-core.c @@ -54,7 +54,6 @@ #define MCHPCOREPWM_TIMEOUT_MS 100u struct mchp_core_pwm_chip { - struct pwm_chip chip; struct clk *clk; void __iomem *base; struct mutex lock; /* protects the shared period */ @@ -65,7 +64,7 @@ struct mchp_core_pwm_chip { static inline struct mchp_core_pwm_chip *to_mchp_core_pwm(struct pwm_chip *chip) { - return container_of(chip, struct mchp_core_pwm_chip, chip); + return pwmchip_priv(chip); } static void mchp_core_pwm_enable(struct pwm_chip *chip, struct pwm_device *pwm, @@ -447,13 +446,15 @@ MODULE_DEVICE_TABLE(of, mchp_core_of_match); static int mchp_core_pwm_probe(struct platform_device *pdev) { + struct pwm_chip *chip; struct mchp_core_pwm_chip *mchp_core_pwm; struct resource *regs; int ret; - mchp_core_pwm = devm_kzalloc(&pdev->dev, sizeof(*mchp_core_pwm), GFP_KERNEL); - if (!mchp_core_pwm) - return -ENOMEM; + chip = devm_pwmchip_alloc(&pdev->dev, 16, sizeof(*mchp_core_pwm)); + if (IS_ERR(chip)) + return PTR_ERR(chip); + mchp_core_pwm = to_mchp_core_pwm(chip); mchp_core_pwm->base = devm_platform_get_and_ioremap_resource(pdev, 0, ®s); if (IS_ERR(mchp_core_pwm->base)) @@ -470,9 +471,7 @@ static int mchp_core_pwm_probe(struct platform_device *pdev) mutex_init(&mchp_core_pwm->lock); - mchp_core_pwm->chip.dev = &pdev->dev; - mchp_core_pwm->chip.ops = &mchp_core_pwm_ops; - mchp_core_pwm->chip.npwm = 16; + chip->ops = &mchp_core_pwm_ops; mchp_core_pwm->channel_enabled = readb_relaxed(mchp_core_pwm->base + MCHPCOREPWM_EN(0)); mchp_core_pwm->channel_enabled |= @@ -485,7 +484,7 @@ static int mchp_core_pwm_probe(struct platform_device *pdev) writel_relaxed(1U, mchp_core_pwm->base + MCHPCOREPWM_SYNC_UPD); mchp_core_pwm->update_timestamp = ktime_get(); - ret = devm_pwmchip_add(&pdev->dev, &mchp_core_pwm->chip); + ret = devm_pwmchip_add(&pdev->dev, chip); if (ret) return dev_err_probe(&pdev->dev, ret, "Failed to add pwmchip\n");
This prepares the pwm-microchip-core 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@pengutronix.de> --- drivers/pwm/pwm-microchip-core.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-)