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 18/22] mfd: wm831x-i2c: Make it explicitly non-modular
Date: Sun, 2 Dec 2018 23:23:25 -0500 [thread overview]
Message-ID: <1543811009-15112-19-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_WM831X_I2C
drivers/mfd/Kconfig: bool "Wolfson Microelectronics WM831x/2x PMICs 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.
Also note that MODULE_DEVICE_TABLE is a no-op for non-modular code.
Cc: Lee Jones <lee.jones@linaro.org>
Cc: patches@opensource.cirrus.com
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
---
drivers/mfd/wm831x-i2c.c | 20 ++------------------
1 file changed, 2 insertions(+), 18 deletions(-)
diff --git a/drivers/mfd/wm831x-i2c.c b/drivers/mfd/wm831x-i2c.c
index 22f7054d1b28..0f3af42f7268 100644
--- a/drivers/mfd/wm831x-i2c.c
+++ b/drivers/mfd/wm831x-i2c.c
@@ -13,7 +13,7 @@
*/
#include <linux/kernel.h>
-#include <linux/module.h>
+#include <linux/init.h>
#include <linux/i2c.h>
#include <linux/delay.h>
#include <linux/mfd/core.h>
@@ -68,15 +68,6 @@ static int wm831x_i2c_probe(struct i2c_client *i2c,
return wm831x_device_init(wm831x, i2c->irq);
}
-static int wm831x_i2c_remove(struct i2c_client *i2c)
-{
- struct wm831x *wm831x = i2c_get_clientdata(i2c);
-
- wm831x_device_exit(wm831x);
-
- return 0;
-}
-
static int wm831x_i2c_suspend(struct device *dev)
{
struct wm831x *wm831x = dev_get_drvdata(dev);
@@ -103,7 +94,6 @@ static const struct i2c_device_id wm831x_i2c_id[] = {
{ "wm8326", WM8326 },
{ }
};
-MODULE_DEVICE_TABLE(i2c, wm831x_i2c_id);
static const struct dev_pm_ops wm831x_pm_ops = {
.suspend = wm831x_i2c_suspend,
@@ -115,9 +105,9 @@ static struct i2c_driver wm831x_i2c_driver = {
.name = "wm831x",
.pm = &wm831x_pm_ops,
.of_match_table = of_match_ptr(wm831x_of_match),
+ .suppress_bind_attrs = true,
},
.probe = wm831x_i2c_probe,
- .remove = wm831x_i2c_remove,
.id_table = wm831x_i2c_id,
};
@@ -132,9 +122,3 @@ static int __init wm831x_i2c_init(void)
return ret;
}
subsys_initcall(wm831x_i2c_init);
-
-static void __exit wm831x_i2c_exit(void)
-{
- i2c_del_driver(&wm831x_i2c_driver);
-}
-module_exit(wm831x_i2c_exit);
--
2.7.4
next prev parent reply other threads:[~2018-12-03 4:29 UTC|newest]
Thread overview: 42+ 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 ` [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 ` [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 ` Paul Gortmaker [this message]
2018-12-05 11:38 ` [PATCH 18/22] mfd: wm831x-i2c: " 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 ` [PATCH 22/22] mfd: wm8400-core: Make it explicitly non-modular Paul Gortmaker
2018-12-05 11:41 ` Charles Keepax
2018-12-05 11:35 ` [PATCH v2 00/22] mfd: demodularization of non-modular drivers Charles Keepax
2018-12-05 11:48 ` Linus Walleij
2018-12-05 13:40 ` Charles Keepax
2018-12-05 11:50 ` Linus Walleij
2018-12-05 12:01 ` Steve Twiss
2018-12-05 12:12 ` Steve Twiss
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-19-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).