Re: [PATCH 3/5] mfd: max8998: Make it explicitly non-modular

[Lee Jones]

On Thu, 02 Jun 2016, Paul Gortmaker wrote:

> The Kconfig currently controlling compilation of this code is:
> 
> mfd/Kconfig:config MFD_MAX8998
> mfd/Kconfig:    bool "Maxim Semiconductor MAX8998/National LP3974 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.
> 
> 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_init was not in use by this code, the init ordering
> remains unchanged with this commit.
> 
> We delete the include of module.h as well as an unused include of
> moduleparam.h too.
> 
> 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@xxxxxxxxxxxxxxx>
> Cc: Lee Jones <lee.jones@xxxxxxxxxx>
> Cc: Kyungmin Park <kyungmin.park@xxxxxxxxxxx>
> Signed-off-by: Paul Gortmaker <paul.gortmaker@xxxxxxxxxxxxx>
> ---
>  drivers/mfd/max8998.c | 27 +--------------------------
>  1 file changed, 1 insertion(+), 26 deletions(-)

Applied, thanks.

> diff --git a/drivers/mfd/max8998.c b/drivers/mfd/max8998.c
> index ab28b29400f6..4c33b8063bc3 100644
> --- a/drivers/mfd/max8998.c
> +++ b/drivers/mfd/max8998.c
> @@ -21,8 +21,6 @@
>   */
>  
>  #include <linux/err.h>
> -#include <linux/module.h>
> -#include <linux/moduleparam.h>
>  #include <linux/init.h>
>  #include <linux/slab.h>
>  #include <linux/i2c.h>
> @@ -138,7 +136,6 @@ static const struct of_device_id max8998_dt_match[] = {
>  	{ .compatible = "ti,lp3974", .data = (void *)TYPE_LP3974 },
>  	{},
>  };
> -MODULE_DEVICE_TABLE(of, max8998_dt_match);
>  #endif
>  
>  /*
> @@ -254,23 +251,11 @@ err:
>  	return ret;
>  }
>  
> -static int max8998_i2c_remove(struct i2c_client *i2c)
> -{
> -	struct max8998_dev *max8998 = i2c_get_clientdata(i2c);
> -
> -	mfd_remove_devices(max8998->dev);
> -	max8998_irq_exit(max8998);
> -	i2c_unregister_device(max8998->rtc);
> -
> -	return 0;
> -}
> -
>  static const struct i2c_device_id max8998_i2c_id[] = {
>  	{ "max8998", TYPE_MAX8998 },
>  	{ "lp3974", TYPE_LP3974},
>  	{ }
>  };
> -MODULE_DEVICE_TABLE(i2c, max8998_i2c_id);
>  
>  static int max8998_suspend(struct device *dev)
>  {
> @@ -378,10 +363,10 @@ static struct i2c_driver max8998_i2c_driver = {
>  	.driver = {
>  		   .name = "max8998",
>  		   .pm = &max8998_pm,
> +		   .suppress_bind_attrs = true,
>  		   .of_match_table = of_match_ptr(max8998_dt_match),
>  	},
>  	.probe = max8998_i2c_probe,
> -	.remove = max8998_i2c_remove,
>  	.id_table = max8998_i2c_id,
>  };
>  
> @@ -391,13 +376,3 @@ static int __init max8998_i2c_init(void)
>  }
>  /* init early so consumer devices can complete system boot */
>  subsys_initcall(max8998_i2c_init);
> -
> -static void __exit max8998_i2c_exit(void)
> -{
> -	i2c_del_driver(&max8998_i2c_driver);
> -}
> -module_exit(max8998_i2c_exit);
> -
> -MODULE_DESCRIPTION("MAXIM 8998 multi-function core driver");
> -MODULE_AUTHOR("Kyungmin Park <kyungmin.park@xxxxxxxxxxx>");
> -MODULE_LICENSE("GPL");

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