| Message ID | 20200419170810.5738-12-robh@kernel.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Modularizing Versatile Express | expand |
On Sun, Apr 19, 2020 at 7:08 PM Rob Herring <robh@kernel.org> wrote: > > Use the managed devm_gpiochip_add_data() and devm_mfd_add_devices() > instead of their unmanaged counterparts. With this, no .remove() hook is > needed for driver unbind. > > Cc: Liviu Dudau <liviu.dudau@arm.com> > Cc: Sudeep Holla <sudeep.holla@arm.com> > Cc: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com> > Cc: Linus Walleij <linus.walleij@linaro.org> > Cc: Lee Jones <lee.jones@linaro.org> > Signed-off-by: Rob Herring <robh@kernel.org> Acked-by: Arnd Bergmann <arnd@arndb.de>
On Sun, Apr 19, 2020 at 12:08:04PM -0500, Rob Herring wrote: > Use the managed devm_gpiochip_add_data() and devm_mfd_add_devices() > instead of their unmanaged counterparts. With this, no .remove() hook is > needed for driver unbind. > > Cc: Liviu Dudau <liviu.dudau@arm.com> Acked-by: Liviu Dudau <liviu.dudau@arm.com> > Cc: Sudeep Holla <sudeep.holla@arm.com> > Cc: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com> > Cc: Linus Walleij <linus.walleij@linaro.org> > Cc: Lee Jones <lee.jones@linaro.org> > Signed-off-by: Rob Herring <robh@kernel.org> > --- > drivers/mfd/vexpress-sysreg.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/mfd/vexpress-sysreg.c b/drivers/mfd/vexpress-sysreg.c > index 90a4eda2ba2b..9fb37fa689e0 100644 > --- a/drivers/mfd/vexpress-sysreg.c > +++ b/drivers/mfd/vexpress-sysreg.c > @@ -140,9 +140,9 @@ static int vexpress_sysreg_probe(struct platform_device *pdev) > bgpio_init(mmc_gpio_chip, &pdev->dev, 0x4, base + SYS_MCI, > NULL, NULL, NULL, NULL, 0); > mmc_gpio_chip->ngpio = 2; > - gpiochip_add_data(mmc_gpio_chip, NULL); > + devm_gpiochip_add_data(&pdev->dev, mmc_gpio_chip, NULL); > > - return mfd_add_devices(&pdev->dev, PLATFORM_DEVID_AUTO, > + return devm_mfd_add_devices(&pdev->dev, PLATFORM_DEVID_AUTO, > vexpress_sysreg_cells, > ARRAY_SIZE(vexpress_sysreg_cells), mem, 0, NULL); > } > -- > 2.20.1 >
diff --git a/drivers/mfd/vexpress-sysreg.c b/drivers/mfd/vexpress-sysreg.c index 90a4eda2ba2b..9fb37fa689e0 100644 --- a/drivers/mfd/vexpress-sysreg.c +++ b/drivers/mfd/vexpress-sysreg.c @@ -140,9 +140,9 @@ static int vexpress_sysreg_probe(struct platform_device *pdev) bgpio_init(mmc_gpio_chip, &pdev->dev, 0x4, base + SYS_MCI, NULL, NULL, NULL, NULL, 0); mmc_gpio_chip->ngpio = 2; - gpiochip_add_data(mmc_gpio_chip, NULL); + devm_gpiochip_add_data(&pdev->dev, mmc_gpio_chip, NULL); - return mfd_add_devices(&pdev->dev, PLATFORM_DEVID_AUTO, + return devm_mfd_add_devices(&pdev->dev, PLATFORM_DEVID_AUTO, vexpress_sysreg_cells, ARRAY_SIZE(vexpress_sysreg_cells), mem, 0, NULL); }
Use the managed devm_gpiochip_add_data() and devm_mfd_add_devices() instead of their unmanaged counterparts. With this, no .remove() hook is needed for driver unbind. Cc: Liviu Dudau <liviu.dudau@arm.com> Cc: Sudeep Holla <sudeep.holla@arm.com> Cc: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com> Cc: Linus Walleij <linus.walleij@linaro.org> Cc: Lee Jones <lee.jones@linaro.org> Signed-off-by: Rob Herring <robh@kernel.org> --- drivers/mfd/vexpress-sysreg.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)