| Message ID | 20221223153820.404565-5-ben.dooks@sifive.com |
|---|---|
| State | Accepted |
| Commit | a357d1493f0c66ce8006dd28c07646d1f891259a |
| Headers | show |
| Series | Designware PWM driver updates for OF | expand |
On Fri, Dec 23, 2022 at 03:38:14PM +0000, Ben Dooks wrote: > In preparation for adding other bus support, move the allocation > of the pwm struct out of the main driver code. > > Signed-off-by: Ben Dooks <ben.dooks@sifive.com> > --- > drivers/pwm/pwm-dwc.c | 24 +++++++++++++++++------- > 1 file changed, 17 insertions(+), 7 deletions(-) > > diff --git a/drivers/pwm/pwm-dwc.c b/drivers/pwm/pwm-dwc.c > index c706ef9a7ba1..61f11e0a9319 100644 > --- a/drivers/pwm/pwm-dwc.c > +++ b/drivers/pwm/pwm-dwc.c > @@ -196,13 +196,29 @@ static const struct pwm_ops dwc_pwm_ops = { > .owner = THIS_MODULE, > }; > > +static struct dwc_pwm *dwc_pwm_alloc(struct device *dev) > +{ > + struct dwc_pwm *dwc; > + > + dwc = devm_kzalloc(dev, sizeof(*dwc), GFP_KERNEL); > + if (!dwc) > + return NULL; > + > + dwc->chip.dev = dev; > + dwc->chip.ops = &dwc_pwm_ops; > + dwc->chip.npwm = DWC_TIMERS_TOTAL; > + > + dev_set_drvdata(dev, dwc); I don't particularily like that this dev_set_drvdata is matched by pci_get_drvdata in .remove(), but this isn't going to break I guess. So: Acked-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Best regards Uwe
diff --git a/drivers/pwm/pwm-dwc.c b/drivers/pwm/pwm-dwc.c index c706ef9a7ba1..61f11e0a9319 100644 --- a/drivers/pwm/pwm-dwc.c +++ b/drivers/pwm/pwm-dwc.c @@ -196,13 +196,29 @@ static const struct pwm_ops dwc_pwm_ops = { .owner = THIS_MODULE, }; +static struct dwc_pwm *dwc_pwm_alloc(struct device *dev) +{ + struct dwc_pwm *dwc; + + dwc = devm_kzalloc(dev, sizeof(*dwc), GFP_KERNEL); + if (!dwc) + return NULL; + + dwc->chip.dev = dev; + dwc->chip.ops = &dwc_pwm_ops; + dwc->chip.npwm = DWC_TIMERS_TOTAL; + + dev_set_drvdata(dev, dwc); + return dwc; +} + static int dwc_pwm_probe(struct pci_dev *pci, const struct pci_device_id *id) { struct device *dev = &pci->dev; struct dwc_pwm *dwc; int ret; - dwc = devm_kzalloc(dev, sizeof(*dwc), GFP_KERNEL); + dwc = dwc_pwm_alloc(dev); if (!dwc) return -ENOMEM; @@ -226,12 +242,6 @@ static int dwc_pwm_probe(struct pci_dev *pci, const struct pci_device_id *id) return -ENOMEM; } - pci_set_drvdata(pci, dwc); - - dwc->chip.dev = dev; - dwc->chip.ops = &dwc_pwm_ops; - dwc->chip.npwm = DWC_TIMERS_TOTAL; - ret = pwmchip_add(&dwc->chip); if (ret) return ret;
In preparation for adding other bus support, move the allocation of the pwm struct out of the main driver code. Signed-off-by: Ben Dooks <ben.dooks@sifive.com> --- drivers/pwm/pwm-dwc.c | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-)