Re: [PATCH 4/5] mfd: max77620: make it explicitly non-modular

[Lee Jones]

On Thu, 02 Jun 2016, Paul Gortmaker wrote:

> The Kconfig currently controlling compilation of this code is:
> 
> drivers/mfd/Kconfig:config MFD_MAX77620
> drivers/mfd/Kconfig:    bool "Maxim Semiconductor MAX77620 and MAX20024 PMIC Support"
> 
> ...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_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
> was (or is now) contained at the top of the file in the comments.
> 
> Cc: Lee Jones <lee.jones@xxxxxxxxxx>
> Cc: Laxman Dewangan <ldewangan@xxxxxxxxxx>
> Cc: Chaitanya Bandi <bandik@xxxxxxxxxx>
> Cc: Mallikarjun Kasoju <mkasoju@xxxxxxxxxx>
> Signed-off-by: Paul Gortmaker <paul.gortmaker@xxxxxxxxxxxxx>
> ---
>  drivers/mfd/max77620.c | 12 ++----------
>  1 file changed, 2 insertions(+), 10 deletions(-)

Applied, thanks.

> diff --git a/drivers/mfd/max77620.c b/drivers/mfd/max77620.c
> index 199d261990be..84a830598fc9 100644
> --- a/drivers/mfd/max77620.c
> +++ b/drivers/mfd/max77620.c
> @@ -31,7 +31,7 @@
>  #include <linux/interrupt.h>
>  #include <linux/mfd/core.h>
>  #include <linux/mfd/max77620.h>
> -#include <linux/module.h>
> +#include <linux/init.h>
>  #include <linux/of.h>
>  #include <linux/of_device.h>
>  #include <linux/regmap.h>
> @@ -566,7 +566,6 @@ static const struct i2c_device_id max77620_id[] = {
>  	{"max20024", MAX20024},
>  	{},
>  };
> -MODULE_DEVICE_TABLE(i2c, max77620_id);
>  
>  static const struct dev_pm_ops max77620_pm_ops = {
>  	SET_SYSTEM_SLEEP_PM_OPS(max77620_i2c_suspend, max77620_i2c_resume)
> @@ -580,11 +579,4 @@ static struct i2c_driver max77620_driver = {
>  	.probe = max77620_probe,
>  	.id_table = max77620_id,
>  };
> -
> -module_i2c_driver(max77620_driver);
> -
> -MODULE_DESCRIPTION("MAX77620/MAX20024 Multi Function Device Core Driver");
> -MODULE_AUTHOR("Laxman Dewangan <ldewangan@xxxxxxxxxx>");
> -MODULE_AUTHOR("Chaitanya Bandi <bandik@xxxxxxxxxx>");
> -MODULE_AUTHOR("Mallikarjun Kasoju <mkasoju@xxxxxxxxxx>");
> -MODULE_LICENSE("GPL v2");
> +builtin_i2c_driver(max77620_driver);

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