Re: [PATCH 5/5] mfd: max77843: 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_MAX77843
> drivers/mfd/Kconfig:    bool "Maxim Semiconductor MAX77843 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_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.
> 
> Cc: Samuel Ortiz <sameo@xxxxxxxxxxxxxxx>
> Cc: Lee Jones <lee.jones@xxxxxxxxxx>
> Signed-off-by: Paul Gortmaker <paul.gortmaker@xxxxxxxxxxxxx>
> ---
>  drivers/mfd/max77843.c | 24 ++----------------------
>  1 file changed, 2 insertions(+), 22 deletions(-)

Applied, thanks.

> diff --git a/drivers/mfd/max77843.c b/drivers/mfd/max77843.c
> index 7cfc95b49c5d..dc5caeaaa6a1 100644
> --- a/drivers/mfd/max77843.c
> +++ b/drivers/mfd/max77843.c
> @@ -15,7 +15,7 @@
>  #include <linux/i2c.h>
>  #include <linux/init.h>
>  #include <linux/interrupt.h>
> -#include <linux/module.h>
> +#include <linux/init.h>
>  #include <linux/mfd/core.h>
>  #include <linux/mfd/max77693-common.h>
>  #include <linux/mfd/max77843-private.h>
> @@ -171,19 +171,6 @@ err_pmic_id:
>  	return ret;
>  }
>  
> -static int max77843_remove(struct i2c_client *i2c)
> -{
> -	struct max77693_dev *max77843 = i2c_get_clientdata(i2c);
> -
> -	mfd_remove_devices(max77843->dev);
> -
> -	regmap_del_irq_chip(max77843->irq, max77843->irq_data_topsys);
> -
> -	i2c_unregister_device(max77843->i2c_chg);
> -
> -	return 0;
> -}
> -
>  static const struct of_device_id max77843_dt_match[] = {
>  	{ .compatible = "maxim,max77843", },
>  	{ },
> @@ -193,7 +180,6 @@ static const struct i2c_device_id max77843_id[] = {
>  	{ "max77843", TYPE_MAX77843, },
>  	{ },
>  };
> -MODULE_DEVICE_TABLE(i2c, max77843_id);
>  
>  static int __maybe_unused max77843_suspend(struct device *dev)
>  {
> @@ -226,9 +212,9 @@ static struct i2c_driver max77843_i2c_driver = {
>  		.name = "max77843",
>  		.pm = &max77843_pm,
>  		.of_match_table = max77843_dt_match,
> +		.suppress_bind_attrs = true,
>  	},
>  	.probe = max77843_probe,
> -	.remove = max77843_remove,
>  	.id_table = max77843_id,
>  };
>  
> @@ -237,9 +223,3 @@ static int __init max77843_i2c_init(void)
>  	return i2c_add_driver(&max77843_i2c_driver);
>  }
>  subsys_initcall(max77843_i2c_init);
> -
> -static void __exit max77843_i2c_exit(void)
> -{
> -	i2c_del_driver(&max77843_i2c_driver);
> -}
> -module_exit(max77843_i2c_exit);

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