From: Paul Gortmaker <paul.gortmaker@windriver.com>
To: <linux-kernel@vger.kernel.org>
Cc: Paul Gortmaker <paul.gortmaker@windriver.com>,
Samuel Ortiz <sameo@linux.intel.com>,
Lee Jones <lee.jones@linaro.org>,
Florian Lobmaier <florian.lobmaier@ams.com>,
Laxman Dewangan <ldewangan@nvidia.com>
Subject: [PATCH 2/6] mfd: as3722: Make it explicitly non-modular
Date: Mon, 4 Jul 2016 21:25:40 -0400 [thread overview]
Message-ID: <20160705012544.14143-3-paul.gortmaker@windriver.com> (raw)
In-Reply-To: <20160705012544.14143-1-paul.gortmaker@windriver.com>
The Kconfig currently controlling compilation of this code is:
drivers/mfd/Kconfig:config MFD_AS3722
drivers/mfd/Kconfig: bool "ams AS3722 Power Management IC"
...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_i2c_driver() uses the same init level priority as
builtin_i2c_driver() the init ordering remains unchanged with
this commit.
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: Samuel Ortiz <sameo@linux.intel.com>
Cc: Lee Jones <lee.jones@linaro.org>
Cc: Florian Lobmaier <florian.lobmaier@ams.com>
Cc: Laxman Dewangan <ldewangan@nvidia.com>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
---
drivers/mfd/as3722.c | 12 ++----------
1 file changed, 2 insertions(+), 10 deletions(-)
diff --git a/drivers/mfd/as3722.c b/drivers/mfd/as3722.c
index f87342c211bc..c8a199d081ce 100644
--- a/drivers/mfd/as3722.c
+++ b/drivers/mfd/as3722.c
@@ -27,7 +27,7 @@
#include <linux/interrupt.h>
#include <linux/irq.h>
#include <linux/kernel.h>
-#include <linux/module.h>
+#include <linux/init.h>
#include <linux/mfd/core.h>
#include <linux/mfd/as3722.h>
#include <linux/of.h>
@@ -439,13 +439,11 @@ static const struct of_device_id as3722_of_match[] = {
{ .compatible = "ams,as3722", },
{},
};
-MODULE_DEVICE_TABLE(of, as3722_of_match);
static const struct i2c_device_id as3722_i2c_id[] = {
{ "as3722", 0 },
{},
};
-MODULE_DEVICE_TABLE(i2c, as3722_i2c_id);
static const struct dev_pm_ops as3722_pm_ops = {
SET_SYSTEM_SLEEP_PM_OPS(as3722_i2c_suspend, as3722_i2c_resume)
@@ -460,10 +458,4 @@ static struct i2c_driver as3722_i2c_driver = {
.probe = as3722_i2c_probe,
.id_table = as3722_i2c_id,
};
-
-module_i2c_driver(as3722_i2c_driver);
-
-MODULE_DESCRIPTION("I2C support for AS3722 PMICs");
-MODULE_AUTHOR("Florian Lobmaier <florian.lobmaier@ams.com>");
-MODULE_AUTHOR("Laxman Dewangan <ldewangan@nvidia.com>");
-MODULE_LICENSE("GPL");
+builtin_i2c_driver(as3722_i2c_driver);
--
2.8.4
next prev parent reply other threads:[~2016-07-05 1:26 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-07-05 1:25 [PATCH 0/6] mfd: trivial demodularization of non-modular drivers Paul Gortmaker
2016-07-05 1:25 ` [PATCH 1/6] mfd: altera-a10sr: make it explicitly non-modular Paul Gortmaker
2016-08-05 12:57 ` Lee Jones
2016-08-23 20:56 ` Paul Gortmaker
2016-08-31 11:43 ` Lee Jones
2016-07-05 1:25 ` Paul Gortmaker [this message]
2016-07-05 5:48 ` [PATCH 2/6] mfd: as3722: Make " Laxman Dewangan
2016-07-06 16:45 ` Paul Gortmaker
2016-08-05 12:56 ` Lee Jones
2016-08-05 13:50 ` Paul Gortmaker
2016-08-08 9:14 ` Lee Jones
2016-08-08 14:01 ` Paul Gortmaker
2016-07-05 1:25 ` [PATCH 3/6] mfd: intel_msic: " Paul Gortmaker
2016-07-05 10:08 ` Mika Westerberg
2016-07-06 16:38 ` Paul Gortmaker
2016-07-07 8:11 ` Mika Westerberg
2016-07-07 10:26 ` Andy Shevchenko
2016-07-07 10:33 ` Mika Westerberg
2016-08-05 12:57 ` Lee Jones
2016-07-05 1:25 ` [PATCH 4/6] mfd: smsc-ece1099: " Paul Gortmaker
2016-08-05 12:57 ` Lee Jones
2016-07-05 1:25 ` [PATCH 5/6] mfd: sun6i-prcm: " Paul Gortmaker
2016-07-05 6:24 ` Maxime Ripard
2016-08-05 12:57 ` Lee Jones
2016-07-05 1:25 ` [PATCH 6/6] mfd: twl-core: " Paul Gortmaker
2016-08-05 12:58 ` Lee Jones
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=20160705012544.14143-3-paul.gortmaker@windriver.com \
--to=paul.gortmaker@windriver.com \
--cc=florian.lobmaier@ams.com \
--cc=ldewangan@nvidia.com \
--cc=lee.jones@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=sameo@linux.intel.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).