Re: [PATCH 4/6] mfd: smsc-ece1099: Make it explicitly non-modular

Lee Jones
2016-08-05T12:56:21Z

On Mon, 04 Jul 2016, Paul Gortmaker wrote:

> The Kconfig currently controlling compilation of this code is:
>
> drivers/mfd/Kconfig:config MFD_SMSC
> drivers/mfd/Kconfig: bool "SMSC ECE1099 series chips"
>
> ...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 replace module.h with init.h and delete an unused moduleparam.h
> include.
>
> 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: Samuel Ortiz <sameo@linux.intel.com>
> Cc: Lee Jones <lee.jones@linaro.org>
> Cc: Sourav Poddar <sourav.poddar@ti.com>
> Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
> ---
> drivers/mfd/smsc-ece1099.c | 11 ++---------
> 1 file changed, 2 insertions(+), 9 deletions(-)

Applied, thanks.

> diff --git a/drivers/mfd/smsc-ece1099.c b/drivers/mfd/smsc-ece1099.c
> index cd18c09827ef..1f40baf1234e 100644
> --- a/drivers/mfd/smsc-ece1099.c
> +++ b/drivers/mfd/smsc-ece1099.c
> @@ -11,8 +11,7 @@
> *
> */
>
> -#include <linux/module.h>
> -#include <linux/moduleparam.h>
> +#include <linux/init.h>
> #include <linux/slab.h>
> #include <linux/i2c.h>
> #include <linux/gpio.h>
> @@ -81,7 +80,6 @@ static const struct i2c_device_id smsc_i2c_id[] = {
> { "smscece1099", 0},
> {},
> };
> -MODULE_DEVICE_TABLE(i2c, smsc_i2c_id);
>
> static struct i2c_driver smsc_i2c_driver = {
> .driver = {
> @@ -90,9 +88,4 @@ static struct i2c_driver smsc_i2c_driver = {
> .probe = smsc_i2c_probe,
> .id_table = smsc_i2c_id,
> };
> -
> -module_i2c_driver(smsc_i2c_driver);
> -
> -MODULE_AUTHOR("Sourav Poddar <sourav.poddar@ti.com>");
> -MODULE_DESCRIPTION("SMSC chip multi-function driver");
> -MODULE_LICENSE("GPL v2");
> +builtin_i2c_driver(smsc_i2c_driver);

--
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog