| Message ID | 20160912144054.27522-7-paul.gortmaker@windriver.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
* Paul Gortmaker <paul.gortmaker@windriver.com> [160912 07:41]: > The Kconfig currently controlling compilation of this code is: > > drivers/mfd/Kconfig:config TWL4030_CORE > drivers/mfd/Kconfig: bool "TI TWL4030/TWL5030/TWL6030/TPS659x0 Support" > > ...meaning that it currently is not being built as a module by anyone. > > Lets remove what modular code that we can, so that when reading the > driver there is less doubt that it is builtin-only. Note that we can't > remove the twl_remove() itself ; it is still used by the probe unwind > routine. So we leave it linked into the .remove as well, even though > it will most likely never be called via that path from an unbind. > > Since module_i2c_driver() uses the same init level priority as > builtin_i2c_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: Tony Lindgren <tony@atomide.com> > Cc: Samuel Ortiz <sameo@linux.intel.com> > Cc: Lee Jones <lee.jones@linaro.org> > Cc: linux-omap@vger.kernel.org > Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> Yeah makes sense to me: Acked-by: Tony Lindgren <tony@atomide.com> -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Mon, 12 Sep 2016, Paul Gortmaker wrote: > The Kconfig currently controlling compilation of this code is: > > drivers/mfd/Kconfig:config TWL4030_CORE > drivers/mfd/Kconfig: bool "TI TWL4030/TWL5030/TWL6030/TPS659x0 Support" > > ...meaning that it currently is not being built as a module by anyone. > > Lets remove what modular code that we can, so that when reading the > driver there is less doubt that it is builtin-only. Note that we can't > remove the twl_remove() itself ; it is still used by the probe unwind > routine. So we leave it linked into the .remove as well, even though > it will most likely never be called via that path from an unbind. > > Since module_i2c_driver() uses the same init level priority as > builtin_i2c_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: Tony Lindgren <tony@atomide.com> > Cc: Samuel Ortiz <sameo@linux.intel.com> > Cc: Lee Jones <lee.jones@linaro.org> > Cc: linux-omap@vger.kernel.org > Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> > --- > drivers/mfd/twl-core.c | 9 +-------- > 1 file changed, 1 insertion(+), 8 deletions(-) Applied, thanks. > diff --git a/drivers/mfd/twl-core.c b/drivers/mfd/twl-core.c > index a49d3db6d936..c64615dca2bd 100644 > --- a/drivers/mfd/twl-core.c > +++ b/drivers/mfd/twl-core.c > @@ -30,7 +30,6 @@ > > #include <linux/init.h> > #include <linux/mutex.h> > -#include <linux/module.h> > #include <linux/platform_device.h> > #include <linux/regmap.h> > #include <linux/clk.h> > @@ -1258,7 +1257,6 @@ static const struct i2c_device_id twl_ids[] = { > { "twl6032", TWL6030_CLASS | TWL6032_SUBCLASS }, /* "Phoenix lite" */ > { /* end of list */ }, > }; > -MODULE_DEVICE_TABLE(i2c, twl_ids); > > /* One Client Driver , 4 Clients */ > static struct i2c_driver twl_driver = { > @@ -1267,9 +1265,4 @@ static struct i2c_driver twl_driver = { > .probe = twl_probe, > .remove = twl_remove, > }; > - > -module_i2c_driver(twl_driver); > - > -MODULE_AUTHOR("Texas Instruments, Inc."); > -MODULE_DESCRIPTION("I2C Core interface for TWL"); > -MODULE_LICENSE("GPL"); > +builtin_i2c_driver(twl_driver);
diff --git a/drivers/mfd/twl-core.c b/drivers/mfd/twl-core.c index a49d3db6d936..c64615dca2bd 100644 --- a/drivers/mfd/twl-core.c +++ b/drivers/mfd/twl-core.c @@ -30,7 +30,6 @@ #include <linux/init.h> #include <linux/mutex.h> -#include <linux/module.h> #include <linux/platform_device.h> #include <linux/regmap.h> #include <linux/clk.h> @@ -1258,7 +1257,6 @@ static const struct i2c_device_id twl_ids[] = { { "twl6032", TWL6030_CLASS | TWL6032_SUBCLASS }, /* "Phoenix lite" */ { /* end of list */ }, }; -MODULE_DEVICE_TABLE(i2c, twl_ids); /* One Client Driver , 4 Clients */ static struct i2c_driver twl_driver = { @@ -1267,9 +1265,4 @@ static struct i2c_driver twl_driver = { .probe = twl_probe, .remove = twl_remove, }; - -module_i2c_driver(twl_driver); - -MODULE_AUTHOR("Texas Instruments, Inc."); -MODULE_DESCRIPTION("I2C Core interface for TWL"); -MODULE_LICENSE("GPL"); +builtin_i2c_driver(twl_driver);
The Kconfig currently controlling compilation of this code is: drivers/mfd/Kconfig:config TWL4030_CORE drivers/mfd/Kconfig: bool "TI TWL4030/TWL5030/TWL6030/TPS659x0 Support" ...meaning that it currently is not being built as a module by anyone. Lets remove what modular code that we can, so that when reading the driver there is less doubt that it is builtin-only. Note that we can't remove the twl_remove() itself ; it is still used by the probe unwind routine. So we leave it linked into the .remove as well, even though it will most likely never be called via that path from an unbind. Since module_i2c_driver() uses the same init level priority as builtin_i2c_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: Tony Lindgren <tony@atomide.com> Cc: Samuel Ortiz <sameo@linux.intel.com> Cc: Lee Jones <lee.jones@linaro.org> Cc: linux-omap@vger.kernel.org Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> --- drivers/mfd/twl-core.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-)