mfd: as3711: Make it explicitly non-modular (1e89d907) · Commits · 戴 / test

The Kconfig currently controlling compilation of this code is: drivers/mfd/Kconfig:config MFD_AS3711 drivers/mfd/Kconfig: bool "AMS AS3711" ...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. We don't replace module.h with init.h since the file already has that. 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> Signed-off-by:

Lee Jones <lee.jones@linaro.org>

drivers/mfd/as3711.c

+0 −14

Original line number	Diff line number	Diff line
		@@ -16,7 +16,6 @@
		#include <linux/kernel.h>
		#include <linux/mfd/as3711.h>
		#include <linux/mfd/core.h>
		#include <linux/module.h>
		#include <linux/of.h>
		#include <linux/regmap.h>
		#include <linux/slab.h>
		@@ -118,7 +117,6 @@ static const struct of_device_id as3711_of_match[] = {
		{.compatible = "ams,as3711",},
		{}
		};
		MODULE_DEVICE_TABLE(of, as3711_of_match);
		#endif

		static int as3711_i2c_probe(struct i2c_client *client,
		@@ -202,8 +200,6 @@ static const struct i2c_device_id as3711_i2c_id[] = {
		{}
		};

		MODULE_DEVICE_TABLE(i2c, as3711_i2c_id);

		static struct i2c_driver as3711_i2c_driver = {
		.driver = {
		.name = "as3711",
		@@ -219,13 +215,3 @@ static int __init as3711_i2c_init(void)
		}
		/* Initialise early */
		subsys_initcall(as3711_i2c_init);

		static void __exit as3711_i2c_exit(void)
		{
		i2c_del_driver(&as3711_i2c_driver);
		}
		module_exit(as3711_i2c_exit);

		MODULE_AUTHOR("Guennadi Liakhovetski <g.liakhovetski@gmx.de>");
		MODULE_DESCRIPTION("AS3711 PMIC driver");
		MODULE_LICENSE("GPL v2");

Admin message