mfd: wm831x-spi: Make it explicitly non-modular (e85c5f0a) · Commits · 戴 / test

The Kconfig currently controlling compilation of this code is: drivers/mfd/Kconfig:config MFD_WM831X_SPI drivers/mfd/Kconfig: bool "Wolfson Microelectronics WM831x/2x PMICs with SPI" ...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. 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/wm831x-spi.c

+2 −22

Original line number	Diff line number	Diff line
		@@ -13,7 +13,7 @@
		*/

		#include <linux/kernel.h>
		#include <linux/module.h>
		#include <linux/init.h>
		#include <linux/of.h>
		#include <linux/of_device.h>
		#include <linux/pm.h>
		@@ -67,15 +67,6 @@ static int wm831x_spi_probe(struct spi_device *spi)
		return wm831x_device_init(wm831x, spi->irq);
		}

		static int wm831x_spi_remove(struct spi_device *spi)
		{
		struct wm831x *wm831x = spi_get_drvdata(spi);

		wm831x_device_exit(wm831x);

		return 0;
		}

		static int wm831x_spi_suspend(struct device *dev)
		{
		struct wm831x *wm831x = dev_get_drvdata(dev);
		@@ -108,17 +99,16 @@ static const struct spi_device_id wm831x_spi_ids[] = {
		{ "wm8326", WM8326 },
		{ },
		};
		MODULE_DEVICE_TABLE(spi, wm831x_spi_ids);

		static struct spi_driver wm831x_spi_driver = {
		.driver = {
		.name = "wm831x",
		.pm = &wm831x_spi_pm,
		.of_match_table = of_match_ptr(wm831x_of_match),
		.suppress_bind_attrs = true,
		},
		.id_table = wm831x_spi_ids,
		.probe = wm831x_spi_probe,
		.remove = wm831x_spi_remove,
		};

		static int __init wm831x_spi_init(void)
		@@ -132,13 +122,3 @@ static int __init wm831x_spi_init(void)
		return 0;
		}
		subsys_initcall(wm831x_spi_init);

		static void __exit wm831x_spi_exit(void)
		{
		spi_unregister_driver(&wm831x_spi_driver);
		}
		module_exit(wm831x_spi_exit);

		MODULE_DESCRIPTION("SPI support for WM831x/2x AudioPlus PMICs");
		MODULE_LICENSE("GPL");
		MODULE_AUTHOR("Mark Brown");

Admin message