Messages in this thread Patch in this message | | | From | Paul Gortmaker <> | Subject | [PATCH 5/7] drivers/mfd: make max77686.c explicitly non-modular | Date | Sun, 3 Apr 2016 17:24:17 -0400 |
| |
The Kconfig currently controlling compilation of this code is:
drivers/mfd/Kconfig:config MFD_MAX77686 drivers/mfd/Kconfig: bool "Maxim Semiconductor MAX77686/802 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.
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: Chanwoo Choi <cw00.choi@samsung.com> Cc: Krzysztof Kozlowski <k.kozlowski@samsung.com> Cc: Samuel Ortiz <sameo@linux.intel.com> Cc: Lee Jones <lee.jones@linaro.org> Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> --- drivers/mfd/max77686.c | 26 ++------------------------ 1 file changed, 2 insertions(+), 24 deletions(-)
diff --git a/drivers/mfd/max77686.c b/drivers/mfd/max77686.c index c1aff46e89d9..d9d47040a49a 100644 --- a/drivers/mfd/max77686.c +++ b/drivers/mfd/max77686.c @@ -28,7 +28,7 @@ #include <linux/irq.h> #include <linux/interrupt.h> #include <linux/pm_runtime.h> -#include <linux/module.h> +#include <linux/init.h> #include <linux/mfd/core.h> #include <linux/mfd/max77686.h> #include <linux/mfd/max77686-private.h> @@ -253,23 +253,11 @@ err_del_irqc: return ret; } -static int max77686_i2c_remove(struct i2c_client *i2c) -{ - struct max77686_dev *max77686 = i2c_get_clientdata(i2c); - - mfd_remove_devices(max77686->dev); - - regmap_del_irq_chip(max77686->irq, max77686->irq_data); - - return 0; -} - static const struct i2c_device_id max77686_i2c_id[] = { { "max77686", TYPE_MAX77686 }, { "max77802", TYPE_MAX77802 }, { } }; -MODULE_DEVICE_TABLE(i2c, max77686_i2c_id); #ifdef CONFIG_PM_SLEEP static int max77686_suspend(struct device *dev) @@ -314,10 +302,10 @@ static struct i2c_driver max77686_i2c_driver = { .driver = { .name = "max77686", .pm = &max77686_pm, + .suppress_bind_attrs = true, .of_match_table = of_match_ptr(max77686_pmic_dt_match), }, .probe = max77686_i2c_probe, - .remove = max77686_i2c_remove, .id_table = max77686_i2c_id, }; @@ -327,13 +315,3 @@ static int __init max77686_i2c_init(void) } /* init early so consumer devices can complete system boot */ subsys_initcall(max77686_i2c_init); - -static void __exit max77686_i2c_exit(void) -{ - i2c_del_driver(&max77686_i2c_driver); -} -module_exit(max77686_i2c_exit); - -MODULE_DESCRIPTION("MAXIM 77686/802 multi-function core driver"); -MODULE_AUTHOR("Chiwoong Byun <woong.byun@samsung.com>"); -MODULE_LICENSE("GPL"); -- 2.8.0
| |