From: Paul Gortmaker <paul.gortmaker@windriver.com>
To: Lee Jones <lee.jones@linaro.org>
Cc: <linux-kernel@vger.kernel.org>,
Paul Gortmaker <paul.gortmaker@windriver.com>,
Charles Keepax <ckeepax@opensource.cirrus.com>,
<patches@opensource.cirrus.com>
Subject: [PATCH 15/18] mfd: wm831x-core: drop unused module infrastructure from non-modular code
Date: Fri, 7 Dec 2018 15:11:02 -0500 [thread overview]
Message-ID: <1544213465-16259-16-git-send-email-paul.gortmaker@windriver.com> (raw)
In-Reply-To: <1544213465-16259-1-git-send-email-paul.gortmaker@windriver.com>
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.
Cc: Lee Jones <lee.jones@linaro.org>
Cc: Charles Keepax <ckeepax@opensource.cirrus.com>
Cc: patches@opensource.cirrus.com
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
---
drivers/mfd/wm831x-core.c | 15 ++-------------
include/linux/mfd/wm831x/core.h | 1 -
2 files changed, 2 insertions(+), 14 deletions(-)
diff --git a/drivers/mfd/wm831x-core.c b/drivers/mfd/wm831x-core.c
index e70d35ef5c6d..25fbbaf39cb9 100644
--- a/drivers/mfd/wm831x-core.c
+++ b/drivers/mfd/wm831x-core.c
@@ -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 @@ int wm831x_device_init(struct wm831x *wm831x, int irq)
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");
diff --git a/include/linux/mfd/wm831x/core.h b/include/linux/mfd/wm831x/core.h
index b49fa67612f1..6fcb8eb00282 100644
--- a/include/linux/mfd/wm831x/core.h
+++ b/include/linux/mfd/wm831x/core.h
@@ -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);
--
2.7.4
next prev parent reply other threads:[~2018-12-07 20:16 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-12-07 20:10 [PATCH v3 00/18] mfd: demodularization of non-modular drivers Paul Gortmaker
2018-12-07 20:10 ` [PATCH 01/18] mfd: aat2870-core: Make it explicitly non-modular Paul Gortmaker
2018-12-07 20:10 ` [PATCH 02/18] mfd: adp5520: " Paul Gortmaker
2018-12-07 20:24 ` Hennerich, Michael
2018-12-07 20:10 ` [PATCH 03/18] mfd: as3711: " Paul Gortmaker
2018-12-07 20:10 ` [PATCH 04/18] mfd: db8500-prcmu: drop unused MODULE_ tags from non-modular code Paul Gortmaker
2018-12-07 20:10 ` [PATCH 05/18] mfd: htc-i2cpld: Make it explicitly non-modular Paul Gortmaker
2018-12-07 20:10 ` [PATCH 06/18] mfd: max8925-core: drop unused MODULE_ tags from non-modular code Paul Gortmaker
2018-12-07 20:10 ` [PATCH 07/18] mfd: rc5t583: Make it explicitly non-modular Paul Gortmaker
2018-12-07 20:10 ` [PATCH 08/18] mfd: sta2x11: drop unused MODULE_ tags from non-modular code Paul Gortmaker
2018-12-07 20:10 ` [PATCH 09/18] mfd: syscon: Make it explicitly non-modular Paul Gortmaker
2018-12-07 20:10 ` [PATCH 10/18] mfd: tps65090: " Paul Gortmaker
2018-12-07 20:10 ` [PATCH 11/18] mfd: tps65910: " Paul Gortmaker
2018-12-07 20:10 ` [PATCH 12/18] mfd: tps80031: " Paul Gortmaker
2018-12-07 20:11 ` [PATCH 13/18] mfd: wm831x-spi: " Paul Gortmaker
2018-12-10 9:25 ` Charles Keepax
2018-12-07 20:11 ` [PATCH 14/18] mfd: wm831x-i2c: " Paul Gortmaker
2018-12-10 9:25 ` Charles Keepax
2018-12-07 20:11 ` Paul Gortmaker [this message]
2018-12-10 9:26 ` [PATCH 15/18] mfd: wm831x-core: drop unused module infrastructure from non-modular code Charles Keepax
2018-12-07 20:11 ` [PATCH 16/18] mfd: wm8350-i2c: Make it explicitly non-modular Paul Gortmaker
2018-12-10 9:28 ` Charles Keepax
2018-12-10 20:00 ` Paul Gortmaker
2018-12-07 20:11 ` [PATCH 17/18] mfd: wm8350-core: drop unused MODULE_ tags from non-modular code Paul Gortmaker
2018-12-10 6:38 ` Lee Jones
2018-12-10 20:10 ` Paul Gortmaker
2018-12-07 20:11 ` [PATCH 18/18] mfd: wm8400-core: Make it explicitly non-modular Paul Gortmaker
2018-12-10 9:28 ` Charles Keepax
2018-12-17 20:31 [PATCH v4 00/18] mfd: demodularization of non-modular drivers Paul Gortmaker
2018-12-17 20:31 ` [PATCH 15/18] mfd: wm831x-core: drop unused module infrastructure from non-modular code Paul Gortmaker
2018-12-19 9:14 ` Charles Keepax
2019-01-13 18:36 [PATCH v5 00/18] mfd: demodularization of non-modular drivers Paul Gortmaker
2019-01-13 18:36 ` [PATCH 15/18] mfd: wm831x-core: drop unused module infrastructure from non-modular code Paul Gortmaker
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1544213465-16259-16-git-send-email-paul.gortmaker@windriver.com \
--to=paul.gortmaker@windriver.com \
--cc=ckeepax@opensource.cirrus.com \
--cc=lee.jones@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=patches@opensource.cirrus.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).