diff options
author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2019-01-13 13:36:49 -0500 |
---|---|---|
committer | Lee Jones <lee.jones@linaro.org> | 2019-02-01 08:21:13 +0000 |
commit | b2b658752c71311f06b6efab5667e98b01b52b6b (patch) | |
tree | b82e993f0621d2a8c7f5ef7330f8d6573fb31fd9 /drivers/mfd/wm8400-core.c | |
parent | 0db88688e1bb0180d6348742bdba8927cd0e5670 (diff) | |
download | linux-stable-b2b658752c71311f06b6efab5667e98b01b52b6b.tar.gz linux-stable-b2b658752c71311f06b6efab5667e98b01b52b6b.tar.bz2 linux-stable-b2b658752c71311f06b6efab5667e98b01b52b6b.zip |
mfd: wm8400-core: Make it explicitly non-modular
The Kconfig currently controlling compilation of this code is:
drivers/mfd/Kconfig:config MFD_WM8400
drivers/mfd/Kconfig: bool "Wolfson Microelectronics WM8400"
...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.
A trivial function rename from wm8400_module_init to the name
wm8400_driver_init is also done to reduce possible confusion.
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.
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Acked-by: Charles Keepax <ckeepax@opensource.cirrus.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Diffstat (limited to 'drivers/mfd/wm8400-core.c')
-rw-r--r-- | drivers/mfd/wm8400-core.c | 18 |
1 files changed, 3 insertions, 15 deletions
diff --git a/drivers/mfd/wm8400-core.c b/drivers/mfd/wm8400-core.c index 8a98a2fc74e1..79756c83f5f0 100644 --- a/drivers/mfd/wm8400-core.c +++ b/drivers/mfd/wm8400-core.c @@ -12,7 +12,7 @@ * */ -#include <linux/module.h> +#include <linux/init.h> #include <linux/bug.h> #include <linux/err.h> #include <linux/i2c.h> @@ -150,7 +150,6 @@ static const struct i2c_device_id wm8400_i2c_id[] = { { "wm8400", 0 }, { } }; -MODULE_DEVICE_TABLE(i2c, wm8400_i2c_id); static struct i2c_driver wm8400_i2c_driver = { .driver = { @@ -161,7 +160,7 @@ static struct i2c_driver wm8400_i2c_driver = { }; #endif -static int __init wm8400_module_init(void) +static int __init wm8400_driver_init(void) { int ret = -ENODEV; @@ -173,15 +172,4 @@ static int __init wm8400_module_init(void) return ret; } -subsys_initcall(wm8400_module_init); - -static void __exit wm8400_module_exit(void) -{ -#if IS_ENABLED(CONFIG_I2C) - i2c_del_driver(&wm8400_i2c_driver); -#endif -} -module_exit(wm8400_module_exit); - -MODULE_LICENSE("GPL"); -MODULE_AUTHOR("Mark Brown <broonie@opensource.wolfsonmicro.com>"); +subsys_initcall(wm8400_driver_init); |