| Message ID | 1542861179-8941-10-git-send-email-paul.gortmaker@windriver.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | mfd: simple demodularization of non-modular drivers | expand |
On Thu, 22 Nov 2018, at 4:32 AM, Paul Gortmaker wrote: > The Kconfig currently controlling compilation of this code is: > > drivers/mfd/Kconfig:config MFD_TPS65910 > drivers/mfd/Kconfig- bool "TI TPS65910 Power Management chip" > > ...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. > > Since module_init was not in use by this code, the init ordering > remains unchanged with this commit. > > We don't replace module.h with init.h since the file already has that. > We do delete an unused moduleparam.h include though. > > 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 > was (or is now) contained at the top of the file in the comments. > This is all fine with me. Acked-by: Graeme Gregory <gg@slimlogic.co.uk> Thanks > Cc: Tony Lindgren <tony@atomide.com> > Cc: Lee Jones <lee.jones@linaro.org> > Cc: Graeme Gregory <gg@slimlogic.co.uk> > Cc: Jorge Eduardo Candelaria <jedu@slimlogic.co.uk> > Cc: linux-omap@vger.kernel.org > Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> > --- > drivers/mfd/tps65910.c | 18 +----------------- > 1 file changed, 1 insertion(+), 17 deletions(-) > > diff --git a/drivers/mfd/tps65910.c b/drivers/mfd/tps65910.c > index bf16cbe6fd88..aa3d472a10ff 100644 > --- a/drivers/mfd/tps65910.c > +++ b/drivers/mfd/tps65910.c > @@ -1,5 +1,5 @@ > /* > - * tps65910.c -- TI TPS6591x > + * tps65910.c -- TI TPS6591x chip family multi-function driver > * > * Copyright 2010 Texas Instruments Inc. > * > @@ -13,8 +13,6 @@ > * > */ > > -#include <linux/module.h> > -#include <linux/moduleparam.h> > #include <linux/init.h> > #include <linux/err.h> > #include <linux/slab.h> > @@ -374,7 +372,6 @@ static const struct of_device_id tps65910_of_match[] = { > { .compatible = "ti,tps65911", .data = (void *)TPS65911}, > { }, > }; > -MODULE_DEVICE_TABLE(of, tps65910_of_match); > > static struct tps65910_board *tps65910_parse_dt(struct i2c_client *client, > unsigned long *chip_id) > @@ -527,8 +524,6 @@ static const struct i2c_device_id tps65910_i2c_id[] = { > { "tps65911", TPS65911 }, > { } > }; > -MODULE_DEVICE_TABLE(i2c, tps65910_i2c_id); > - > > static struct i2c_driver tps65910_i2c_driver = { > .driver = { > @@ -545,14 +540,3 @@ static int __init tps65910_i2c_init(void) > } > /* init early so consumer devices can complete system boot */ > subsys_initcall(tps65910_i2c_init); > - > -static void __exit tps65910_i2c_exit(void) > -{ > - i2c_del_driver(&tps65910_i2c_driver); > -} > -module_exit(tps65910_i2c_exit); > - > -MODULE_AUTHOR("Graeme Gregory <gg@slimlogic.co.uk>"); > -MODULE_AUTHOR("Jorge Eduardo Candelaria <jedu@slimlogic.co.uk>"); > -MODULE_DESCRIPTION("TPS6591x chip family multi-function driver"); > -MODULE_LICENSE("GPL"); > -- > 2.7.4 >
diff --git a/drivers/mfd/tps65910.c b/drivers/mfd/tps65910.c index bf16cbe6fd88..aa3d472a10ff 100644 --- a/drivers/mfd/tps65910.c +++ b/drivers/mfd/tps65910.c @@ -1,5 +1,5 @@ /* - * tps65910.c -- TI TPS6591x + * tps65910.c -- TI TPS6591x chip family multi-function driver * * Copyright 2010 Texas Instruments Inc. * @@ -13,8 +13,6 @@ * */ -#include <linux/module.h> -#include <linux/moduleparam.h> #include <linux/init.h> #include <linux/err.h> #include <linux/slab.h> @@ -374,7 +372,6 @@ static const struct of_device_id tps65910_of_match[] = { { .compatible = "ti,tps65911", .data = (void *)TPS65911}, { }, }; -MODULE_DEVICE_TABLE(of, tps65910_of_match); static struct tps65910_board *tps65910_parse_dt(struct i2c_client *client, unsigned long *chip_id) @@ -527,8 +524,6 @@ static const struct i2c_device_id tps65910_i2c_id[] = { { "tps65911", TPS65911 }, { } }; -MODULE_DEVICE_TABLE(i2c, tps65910_i2c_id); - static struct i2c_driver tps65910_i2c_driver = { .driver = { @@ -545,14 +540,3 @@ static int __init tps65910_i2c_init(void) } /* init early so consumer devices can complete system boot */ subsys_initcall(tps65910_i2c_init); - -static void __exit tps65910_i2c_exit(void) -{ - i2c_del_driver(&tps65910_i2c_driver); -} -module_exit(tps65910_i2c_exit); - -MODULE_AUTHOR("Graeme Gregory <gg@slimlogic.co.uk>"); -MODULE_AUTHOR("Jorge Eduardo Candelaria <jedu@slimlogic.co.uk>"); -MODULE_DESCRIPTION("TPS6591x chip family multi-function driver"); -MODULE_LICENSE("GPL");
The Kconfig currently controlling compilation of this code is: drivers/mfd/Kconfig:config MFD_TPS65910 drivers/mfd/Kconfig- bool "TI TPS65910 Power Management chip" ...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. Since module_init was not in use by this code, the init ordering remains unchanged with this commit. We don't replace module.h with init.h since the file already has that. We do delete an unused moduleparam.h include though. 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 was (or is now) contained at the top of the file in the comments. Cc: Tony Lindgren <tony@atomide.com> Cc: Lee Jones <lee.jones@linaro.org> Cc: Graeme Gregory <gg@slimlogic.co.uk> Cc: Jorge Eduardo Candelaria <jedu@slimlogic.co.uk> Cc: linux-omap@vger.kernel.org Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> --- drivers/mfd/tps65910.c | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-)