All of lore.kernel.org
 help / color / mirror / Atom feed
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>,
	Mark Brown <broonie@opensource.wolfsonmicro.com>,
	<patches@opensource.cirrus.com>
Subject: [PATCH 22/22] mfd: wm8400-core: Make it explicitly non-modular
Date: Sun, 2 Dec 2018 23:23:29 -0500	[thread overview]
Message-ID: <1543811009-15112-23-git-send-email-paul.gortmaker@windriver.com> (raw)
In-Reply-To: <1543811009-15112-1-git-send-email-paul.gortmaker@windriver.com>

The Kconfig currently controlling compilation of this code is:

drivers/mfd/Kconfig:config MFD_WM8400
drivers/mfd/Kconfig:    bool "Wolfson Microelectronics WM8400"

...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.

A trivial function rename from wm8400_module_init to the name
wm8400_driver_init is also done to reduce possible confusion.

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.

Cc: Lee Jones <lee.jones@linaro.org>
Cc: Mark Brown <broonie@opensource.wolfsonmicro.com>
Cc: patches@opensource.cirrus.com
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
---
 drivers/mfd/wm8400-core.c | 18 +++---------------
 1 file changed, 3 insertions(+), 15 deletions(-)

diff --git a/drivers/mfd/wm8400-core.c b/drivers/mfd/wm8400-core.c
index 8a98a2fc74e1..79756c83f5f0 100644
--- a/drivers/mfd/wm8400-core.c
+++ b/drivers/mfd/wm8400-core.c
@@ -12,7 +12,7 @@
  *
  */
 
-#include <linux/module.h>
+#include <linux/init.h>
 #include <linux/bug.h>
 #include <linux/err.h>
 #include <linux/i2c.h>
@@ -150,7 +150,6 @@ static const struct i2c_device_id wm8400_i2c_id[] = {
        { "wm8400", 0 },
        { }
 };
-MODULE_DEVICE_TABLE(i2c, wm8400_i2c_id);
 
 static struct i2c_driver wm8400_i2c_driver = {
 	.driver = {
@@ -161,7 +160,7 @@ static struct i2c_driver wm8400_i2c_driver = {
 };
 #endif
 
-static int __init wm8400_module_init(void)
+static int __init wm8400_driver_init(void)
 {
 	int ret = -ENODEV;
 
@@ -173,15 +172,4 @@ static int __init wm8400_module_init(void)
 
 	return ret;
 }
-subsys_initcall(wm8400_module_init);
-
-static void __exit wm8400_module_exit(void)
-{
-#if IS_ENABLED(CONFIG_I2C)
-	i2c_del_driver(&wm8400_i2c_driver);
-#endif
-}
-module_exit(wm8400_module_exit);
-
-MODULE_LICENSE("GPL");
-MODULE_AUTHOR("Mark Brown <broonie@opensource.wolfsonmicro.com>");
+subsys_initcall(wm8400_driver_init);
-- 
2.7.4


  parent reply	other threads:[~2018-12-03  4:28 UTC|newest]

Thread overview: 51+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-12-03  4:23 [PATCH v2 00/22] mfd: demodularization of non-modular drivers Paul Gortmaker
2018-12-03  4:23 ` Paul Gortmaker
2018-12-03  4:23 ` [PATCH 01/22] mfd: aat2870-core: Make it explicitly non-modular Paul Gortmaker
2018-12-03  4:23 ` [PATCH 02/22] mfd: adp5520: " Paul Gortmaker
2018-12-03  4:23 ` [PATCH 03/22] mfd: as3711: " Paul Gortmaker
2018-12-03  4:23 ` [PATCH 04/22] mfd: da903x: " Paul Gortmaker
2018-12-03  4:23 ` [PATCH 05/22] mfd: da9052-*: " Paul Gortmaker
2018-12-03  4:23 ` [PATCH 06/22] mfd: da9055-i2c: " Paul Gortmaker
2018-12-03  4:23 ` [PATCH 07/22] mfd: da9055-core: make " Paul Gortmaker
2018-12-03  4:23 ` [PATCH 08/22] mfd: db8500-prcmu: drop unused MODULE_ tags from non-modular code Paul Gortmaker
2018-12-07 12:25   ` Linus Walleij
2018-12-03  4:23 ` [PATCH 09/22] mfd: htc-i2cpld: Make it explicitly non-modular Paul Gortmaker
2018-12-03  4:23 ` [PATCH 10/22] mfd: max8925-core: drop unused MODULE_ tags from non-modular code Paul Gortmaker
2018-12-03  4:23 ` [PATCH 11/22] mfd: rc5t583: Make it explicitly non-modular Paul Gortmaker
2018-12-03  4:23 ` [PATCH 12/22] mfd: sta2x11: drop unused MODULE_ tags from non-modular code Paul Gortmaker
2018-12-03 11:14   ` Lee Jones
2018-12-03 15:07     ` Paul Gortmaker
2018-12-04  9:23       ` Davide Ciminaghi
2018-12-07 16:39     ` Alessandro Rubini
2018-12-03  4:23 ` [PATCH 13/22] mfd: syscon: Make it explicitly non-modular Paul Gortmaker
2018-12-03  4:23 ` [PATCH 14/22] mfd: tps65090: " Paul Gortmaker
2018-12-03  4:23 ` [PATCH 15/22] mfd: tps65910: " Paul Gortmaker
2018-12-03  4:23   ` Paul Gortmaker
2018-12-03  4:23 ` [PATCH 16/22] mfd: tps80031: " Paul Gortmaker
2018-12-03  4:23 ` [PATCH 17/22] mfd: wm831x-spi: " Paul Gortmaker
2018-12-03  4:23 ` [PATCH 18/22] mfd: wm831x-i2c: " Paul Gortmaker
2018-12-05 11:38   ` Charles Keepax
2018-12-07 18:16     ` Paul Gortmaker
2018-12-03  4:23 ` [PATCH 19/22] mfd: wm831x-core: drop unused MODULE_ tags from non-modular code Paul Gortmaker
2018-12-05 11:36   ` Charles Keepax
2018-12-03  4:23 ` [PATCH 20/22] mfd: wm8350-i2c: Make it explicitly non-modular Paul Gortmaker
2018-12-05 11:39   ` Charles Keepax
2018-12-03  4:23 ` [PATCH 21/22] mfd: wm8350-core: drop unused MODULE_ tags from non-modular code Paul Gortmaker
2018-12-05 11:39   ` Charles Keepax
2018-12-03  4:23 ` Paul Gortmaker [this message]
2018-12-05 11:41   ` [PATCH 22/22] mfd: wm8400-core: Make it explicitly non-modular Charles Keepax
2018-12-05 11:35 ` [PATCH v2 00/22] mfd: demodularization of non-modular drivers Charles Keepax
2018-12-05 11:35   ` Charles Keepax
2018-12-05 11:48   ` Linus Walleij
2018-12-05 11:48     ` Linus Walleij
2018-12-05 13:40     ` Charles Keepax
2018-12-05 13:40       ` Charles Keepax
2018-12-05 11:50 ` Linus Walleij
2018-12-05 11:50   ` Linus Walleij
2018-12-05 12:01 ` Steve Twiss
2018-12-05 12:01   ` Steve Twiss
2018-12-05 12:12   ` Steve Twiss
2018-12-05 12:12     ` Steve Twiss
2018-12-05 18:08   ` Paul Gortmaker
2018-12-05 18:08     ` Paul Gortmaker
     [not found]   ` <20181207203021.GR23156@windriver.com>
2019-08-07 10:43     ` Steve Twiss

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=1543811009-15112-23-git-send-email-paul.gortmaker@windriver.com \
    --to=paul.gortmaker@windriver.com \
    --cc=broonie@opensource.wolfsonmicro.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.