linux-kernel.vger.kernel.org archive mirror
 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>,
	<patches@opensource.cirrus.com>
Subject: [PATCH 16/18] mfd: wm8350-i2c: Make it explicitly non-modular
Date: Mon, 17 Dec 2018 15:31:26 -0500	[thread overview]
Message-ID: <1545078688-21217-17-git-send-email-paul.gortmaker@windriver.com> (raw)
In-Reply-To: <1545078688-21217-1-git-send-email-paul.gortmaker@windriver.com>

The Kconfig currently controlling compilation of this code is:

drivers/mfd/Kconfig:config MFD_WM8350_I2C
drivers/mfd/Kconfig:    bool "Wolfson Microelectronics WM8350 with I2C"

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

We don't replace module.h with init.h since the file already has that.
But we do delete an unused moduleparam.h

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: patches@opensource.cirrus.com
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
---
 drivers/mfd/wm8350-i2c.c | 24 +-----------------------
 1 file changed, 1 insertion(+), 23 deletions(-)

diff --git a/drivers/mfd/wm8350-i2c.c b/drivers/mfd/wm8350-i2c.c
index 9358f03b7938..b4194e068e1b 100644
--- a/drivers/mfd/wm8350-i2c.c
+++ b/drivers/mfd/wm8350-i2c.c
@@ -13,8 +13,6 @@
  *
  */
 
-#include <linux/module.h>
-#include <linux/moduleparam.h>
 #include <linux/err.h>
 #include <linux/init.h>
 #include <linux/i2c.h>
@@ -48,30 +46,19 @@ static int wm8350_i2c_probe(struct i2c_client *i2c,
 	return wm8350_device_init(wm8350, i2c->irq, pdata);
 }
 
-static int wm8350_i2c_remove(struct i2c_client *i2c)
-{
-	struct wm8350 *wm8350 = i2c_get_clientdata(i2c);
-
-	wm8350_device_exit(wm8350);
-
-	return 0;
-}
-
 static const struct i2c_device_id wm8350_i2c_id[] = {
 	{ "wm8350", 0 },
 	{ "wm8351", 0 },
 	{ "wm8352", 0 },
 	{ }
 };
-MODULE_DEVICE_TABLE(i2c, wm8350_i2c_id);
-
 
 static struct i2c_driver wm8350_i2c_driver = {
 	.driver = {
 		   .name = "wm8350",
+		   .suppress_bind_attrs = true,
 	},
 	.probe = wm8350_i2c_probe,
-	.remove = wm8350_i2c_remove,
 	.id_table = wm8350_i2c_id,
 };
 
@@ -81,12 +68,3 @@ static int __init wm8350_i2c_init(void)
 }
 /* init early so consumer devices can complete system boot */
 subsys_initcall(wm8350_i2c_init);
-
-static void __exit wm8350_i2c_exit(void)
-{
-	i2c_del_driver(&wm8350_i2c_driver);
-}
-module_exit(wm8350_i2c_exit);
-
-MODULE_DESCRIPTION("I2C support for the WM8350 AudioPlus PMIC");
-MODULE_LICENSE("GPL");
-- 
2.7.4


  parent reply	other threads:[~2018-12-17 20:37 UTC|newest]

Thread overview: 37+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-12-17 20:31 [PATCH v4 00/18] mfd: demodularization of non-modular drivers Paul Gortmaker
2018-12-17 20:31 ` [PATCH 01/18] mfd: aat2870-core: Make it explicitly non-modular Paul Gortmaker
2018-12-18  6:21   ` jinyoungp
2018-12-17 20:31 ` [PATCH 02/18] mfd: adp5520: " Paul Gortmaker
2018-12-18  7:43   ` Hennerich, Michael
2018-12-17 20:31 ` [PATCH 03/18] mfd: as3711: " Paul Gortmaker
2018-12-17 20:31 ` [PATCH 04/18] mfd: db8500-prcmu: drop unused MODULE_ tags from non-modular code Paul Gortmaker
2018-12-17 20:31 ` [PATCH 05/18] mfd: htc-i2cpld: Make it explicitly non-modular Paul Gortmaker
2018-12-17 20:31 ` [PATCH 06/18] mfd: max8925-core: drop unused MODULE_ tags from non-modular code Paul Gortmaker
2018-12-17 20:31 ` [PATCH 07/18] mfd: rc5t583: Make it explicitly non-modular Paul Gortmaker
2018-12-18 10:04   ` Laxman Dewangan
2018-12-17 20:31 ` [PATCH 08/18] mfd: sta2x11: drop unused MODULE_ tags from non-modular code Paul Gortmaker
2018-12-17 20:31 ` [PATCH 09/18] mfd: syscon: Make it explicitly non-modular Paul Gortmaker
2018-12-17 20:31 ` [PATCH 10/18] mfd: tps65090: " Paul Gortmaker
2018-12-17 20:31 ` [PATCH 11/18] mfd: tps65910: " Paul Gortmaker
2018-12-23 16:35   ` Tony Lindgren
2018-12-17 20:31 ` [PATCH 12/18] mfd: tps80031: " Paul Gortmaker
2018-12-18 10:07   ` Laxman Dewangan
2018-12-17 20:31 ` [PATCH 13/18] mfd: wm831x-spi: " Paul Gortmaker
2018-12-19  9:14   ` Charles Keepax
2018-12-17 20:31 ` [PATCH 14/18] mfd: wm831x-i2c: " Paul Gortmaker
2018-12-19  9:14   ` Charles Keepax
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
2018-12-17 20:31 ` Paul Gortmaker [this message]
2018-12-19  9:14   ` [PATCH 16/18] mfd: wm8350-i2c: Make it explicitly non-modular Charles Keepax
2018-12-17 20:31 ` [PATCH 17/18] mfd: wm8350-core: drop unused module infrastructure from non-modular code Paul Gortmaker
2018-12-19  9:15   ` Charles Keepax
2018-12-17 20:31 ` [PATCH 18/18] mfd: wm8400-core: Make it explicitly non-modular Paul Gortmaker
2018-12-19  9:17   ` Charles Keepax
2018-12-21 15:55     ` Paul Gortmaker
2018-12-28  9:42       ` Charles Keepax
2018-12-19  8:03 ` [PATCH v4 00/18] mfd: demodularization of non-modular drivers Lee Jones
  -- strict thread matches above, loose matches on Subject: below --
2019-01-13 18:36 [PATCH v5 " Paul Gortmaker
2019-01-13 18:36 ` [PATCH 16/18] mfd: wm8350-i2c: Make it explicitly non-modular Paul Gortmaker
2018-12-07 20:10 [PATCH v3 00/18] mfd: demodularization of non-modular drivers Paul Gortmaker
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

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=1545078688-21217-17-git-send-email-paul.gortmaker@windriver.com \
    --to=paul.gortmaker@windriver.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).