leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mfd: wm8400-core: Make it explicitly non-modular

Browse Source 
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>
This commit is contained in:
Paul Gortmaker 2019-01-13 13:36:49 -05:00 committed by Lee Jones
parent 0db88688e1
commit b2b658752c
1 changed files with 3 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/mfd/wm8400-core.c
View File

@ -12,7 +12,7 @@
* *
*/ */
#include <linux/module.h> #include <linux/init.h>
#include <linux/bug.h> #include <linux/bug.h>
#include <linux/err.h> #include <linux/err.h>
#include <linux/i2c.h> #include <linux/i2c.h>
@ -150,7 +150,6 @@ static const struct i2c_device_id wm8400_i2c_id[] = {
{ "wm8400", 0 }, { "wm8400", 0 },
{ } { }
}; };
MODULE_DEVICE_TABLE(i2c, wm8400_i2c_id);
static struct i2c_driver wm8400_i2c_driver = { static struct i2c_driver wm8400_i2c_driver = {
.driver = { .driver = {
@ -161,7 +160,7 @@ static struct i2c_driver wm8400_i2c_driver = {
}; };
#endif #endif
static int __init wm8400_module_init(void) static int __init wm8400_driver_init(void)
{ {
int ret = -ENODEV; int ret = -ENODEV;
@ -173,15 +172,4 @@ static int __init wm8400_module_init(void)
return ret; return ret;
} }
subsys_initcall(wm8400_module_init); subsys_initcall(wm8400_driver_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>");