Commit fc643066 authored Jan 13, 2019 by Paul Gortmaker Committed by Lee Jones Feb 01, 2019

mfd: wm8350-i2c: Make it explicitly non-modular



The Kconfig currently controlling compilation of this code is:

drivers/mfd/Kconfig:config MFD_WM8350_I2C
drivers/mfd/Kconfig:    bool "Wolfson Microelectronics WM8350 with I2C"

...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 don't replace module.h with init.h since the file already has that.
But we do delete an unused moduleparam.h

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>

parent efb5a790

drivers/mfd/wm8350-i2c.c

+1 −23

Original line number	Diff line number	Diff line
		@@ -13,8 +13,6 @@
		*
		*/

		#include <linux/module.h>
		#include <linux/moduleparam.h>
		#include <linux/err.h>
		#include <linux/init.h>
		#include <linux/i2c.h>
		@@ -48,30 +46,19 @@ static int wm8350_i2c_probe(struct i2c_client *i2c,
		return wm8350_device_init(wm8350, i2c->irq, pdata);
		}

		static int wm8350_i2c_remove(struct i2c_client *i2c)
		{
		struct wm8350 *wm8350 = i2c_get_clientdata(i2c);

		wm8350_device_exit(wm8350);

		return 0;
		}

		static const struct i2c_device_id wm8350_i2c_id[] = {
		{ "wm8350", 0 },
		{ "wm8351", 0 },
		{ "wm8352", 0 },
		{ }
		};
		MODULE_DEVICE_TABLE(i2c, wm8350_i2c_id);


		static struct i2c_driver wm8350_i2c_driver = {
		.driver = {
		.name = "wm8350",
		.suppress_bind_attrs = true,
		},
		.probe = wm8350_i2c_probe,
		.remove = wm8350_i2c_remove,
		.id_table = wm8350_i2c_id,
		};

		@@ -81,12 +68,3 @@ static int __init wm8350_i2c_init(void)
		}
		/* init early so consumer devices can complete system boot */
		subsys_initcall(wm8350_i2c_init);

		static void __exit wm8350_i2c_exit(void)
		{
		i2c_del_driver(&wm8350_i2c_driver);
		}
		module_exit(wm8350_i2c_exit);

		MODULE_DESCRIPTION("I2C support for the WM8350 AudioPlus PMIC");
		MODULE_LICENSE("GPL");

Admin message