mfd: wm831x-core: Drop unused module infrastructure from non-modular code (efb5a790) · Commits · 戴 / test

The Kconfig currently controlling compilation of this code is: drivers/mfd/Kconfig:config MFD_WM831X drivers/mfd/Kconfig: bool ...meaning that it currently is not being built as a module by anyone. Lets remove the couple traces of modular infrastructure use, so that when reading the driver there is no doubt it is builtin-only. We delete the MODULE_LICENSE tag etc. since all that information is already contained at the top of the file in the comments. Previous demodularizaion work has made wm831x_device_exit() no longer used, so it is also removed from the 831x core code. Signed-off-by:

Paul Gortmaker <paul.gortmaker@windriver.com> Acked-by:

Charles Keepax <ckeepax@opensource.cirrus.com> Signed-off-by:

Lee Jones <lee.jones@linaro.org>

drivers/mfd/wm831x-core.c

+2 −13

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

		#include <linux/kernel.h>
		#include <linux/module.h>
		#include <linux/init.h>
		#include <linux/export.h>
		#include <linux/bcd.h>
		#include <linux/delay.h>
		#include <linux/mfd/core.h>
		@@ -1892,14 +1893,6 @@ err:
		return ret;
		}

		void wm831x_device_exit(struct wm831x *wm831x)
		{
		wm831x_otp_exit(wm831x);
		mfd_remove_devices(wm831x->dev);
		free_irq(wm831x_irq(wm831x, WM831X_IRQ_AUXADC_DATA), wm831x);
		wm831x_irq_exit(wm831x);
		}

		int wm831x_device_suspend(struct wm831x *wm831x)
		{
		int reg, mask;
		@@ -1944,7 +1937,3 @@ void wm831x_device_shutdown(struct wm831x *wm831x)
		}
		}
		EXPORT_SYMBOL_GPL(wm831x_device_shutdown);

		MODULE_DESCRIPTION("Core support for the WM831X AudioPlus PMIC");
		MODULE_LICENSE("GPL");
		MODULE_AUTHOR("Mark Brown");

include/linux/mfd/wm831x/core.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -418,7 +418,6 @@ int wm831x_bulk_read(struct wm831x *wm831x, unsigned short reg,
		int count, u16 *buf);

		int wm831x_device_init(struct wm831x *wm831x, int irq);
		void wm831x_device_exit(struct wm831x *wm831x);
		int wm831x_device_suspend(struct wm831x *wm831x);
		void wm831x_device_shutdown(struct wm831x *wm831x);
		int wm831x_irq_init(struct wm831x *wm831x, int irq);

Admin message