On Mon, Jun 06, 2016 at 10:43:08PM -0400, Paul Gortmaker wrote: > The Kconfig currently controlling compilation of this code is: > > drivers/pinctrl/Kconfig:config PINCTRL_AT91PIO4 > drivers/pinctrl/Kconfig: bool "AT91 PIO4 pinctrl driver" > > ...meaning that it currently is not being built as a module by anyone. > > Lets remove the modular code that is essentially orphaned, so that > when reading the driver there is no doubt it is builtin-only. > > We explicitly disallow a driver unbind, since that doesn't have a > sensible use case anyway, and it allows us to drop the ".remove" > code for non-modular drivers. > > Since module_platform_driver() uses the same init level priority as > builtin_platform_driver() the init ordering remains unchanged with > this commit. > > Also note that MODULE_DEVICE_TABLE is a no-op for non-modular code. > > We also delete the MODULE_LICENSE tag etc. since all that information > is already contained at the top of the file in the comments. > > Cc: Ludovic Desroches <[email protected]> > Cc: Linus Walleij <[email protected]> > Cc: [email protected] > Signed-off-by: Paul Gortmaker <[email protected]>
Thanks for cleaning this stuff. Acked-by: Ludovic Desroches <[email protected]> > --- > drivers/pinctrl/pinctrl-at91-pio4.c | 22 +++------------------- > 1 file changed, 3 insertions(+), 19 deletions(-) > > diff --git a/drivers/pinctrl/pinctrl-at91-pio4.c > b/drivers/pinctrl/pinctrl-at91-pio4.c > index a025b40d246b..4438dca85c1c 100644 > --- a/drivers/pinctrl/pinctrl-at91-pio4.c > +++ b/drivers/pinctrl/pinctrl-at91-pio4.c > @@ -20,7 +20,7 @@ > #include <linux/gpio.h> > #include <linux/interrupt.h> > #include <linux/io.h> > -#include <linux/module.h> > +#include <linux/init.h> > #include <linux/of.h> > #include <linux/platform_device.h> > #include <linux/pinctrl/pinconf.h> > @@ -879,7 +879,6 @@ static const struct of_device_id atmel_pctrl_of_match[] = > { > /* sentinel */ > } > }; > -MODULE_DEVICE_TABLE(of, atmel_pctrl_of_match); > > static int atmel_pinctrl_probe(struct platform_device *pdev) > { > @@ -1074,28 +1073,13 @@ clk_prepare_enable_error: > return ret; > } > > -int atmel_pinctrl_remove(struct platform_device *pdev) > -{ > - struct atmel_pioctrl *atmel_pioctrl = platform_get_drvdata(pdev); > - > - irq_domain_remove(atmel_pioctrl->irq_domain); > - clk_disable_unprepare(atmel_pioctrl->clk); > - gpiochip_remove(atmel_pioctrl->gpio_chip); > - > - return 0; > -} > - > static struct platform_driver atmel_pinctrl_driver = { > .driver = { > .name = "pinctrl-at91-pio4", > .of_match_table = atmel_pctrl_of_match, > .pm = &atmel_pctrl_pm_ops, > + .suppress_bind_attrs = true, > }, > .probe = atmel_pinctrl_probe, > - .remove = atmel_pinctrl_remove, > }; > -module_platform_driver(atmel_pinctrl_driver); > - > -MODULE_AUTHOR(Ludovic Desroches <[email protected]>); > -MODULE_DESCRIPTION("Atmel PIO4 pinctrl driver"); > -MODULE_LICENSE("GPL v2"); > +builtin_platform_driver(atmel_pinctrl_driver); > -- > 2.8.0 >
