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>,
Michael Hennerich <michael.hennerich@analog.com>
Subject: [PATCH 02/18] mfd: adp5520: Make it explicitly non-modular
Date: Fri, 7 Dec 2018 15:10:49 -0500 [thread overview]
Message-ID: <1544213465-16259-3-git-send-email-paul.gortmaker@windriver.com> (raw)
In-Reply-To: <1544213465-16259-1-git-send-email-paul.gortmaker@windriver.com>
The Makefile/Kconfig currently controlling compilation of this code is:
drivers/mfd/Makefile:obj-$(CONFIG_PMIC_ADP5520) += adp5520.o
drivers/mfd/Kconfig:config PMIC_ADP5520
drivers/mfd/Kconfig: bool "Analog Devices ADP5520/01 MFD PMIC Core Support"
...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_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
was (or is now) contained at the top of the file in the comments.
Cc: Michael Hennerich <michael.hennerich@analog.com>
Cc: Lee Jones <lee.jones@linaro.org>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
---
drivers/mfd/adp5520.c | 30 +++++++-----------------------
1 file changed, 7 insertions(+), 23 deletions(-)
diff --git a/drivers/mfd/adp5520.c b/drivers/mfd/adp5520.c
index be0497b96720..2cdd39cb8a18 100644
--- a/drivers/mfd/adp5520.c
+++ b/drivers/mfd/adp5520.c
@@ -7,6 +7,8 @@
*
* Copyright 2009 Analog Devices Inc.
*
+ * Author: Michael Hennerich <michael.hennerich@analog.com>
+ *
* Derived from da903x:
* Copyright (C) 2008 Compulab, Ltd.
* Mike Rapoport <mike@compulab.co.il>
@@ -18,7 +20,7 @@
*/
#include <linux/kernel.h>
-#include <linux/module.h>
+#include <linux/init.h>
#include <linux/platform_device.h>
#include <linux/slab.h>
#include <linux/interrupt.h>
@@ -304,18 +306,6 @@ static int adp5520_probe(struct i2c_client *client,
return ret;
}
-static int adp5520_remove(struct i2c_client *client)
-{
- struct adp5520_chip *chip = dev_get_drvdata(&client->dev);
-
- if (chip->irq)
- free_irq(chip->irq, chip);
-
- adp5520_remove_subdevs(chip);
- adp5520_write(chip->dev, ADP5520_MODE_STATUS, 0);
- return 0;
-}
-
#ifdef CONFIG_PM_SLEEP
static int adp5520_suspend(struct device *dev)
{
@@ -346,20 +336,14 @@ static const struct i2c_device_id adp5520_id[] = {
{ "pmic-adp5501", ID_ADP5501 },
{ }
};
-MODULE_DEVICE_TABLE(i2c, adp5520_id);
static struct i2c_driver adp5520_driver = {
.driver = {
- .name = "adp5520",
- .pm = &adp5520_pm,
+ .name = "adp5520",
+ .pm = &adp5520_pm,
+ .suppress_bind_attrs = true,
},
.probe = adp5520_probe,
- .remove = adp5520_remove,
.id_table = adp5520_id,
};
-
-module_i2c_driver(adp5520_driver);
-
-MODULE_AUTHOR("Michael Hennerich <michael.hennerich@analog.com>");
-MODULE_DESCRIPTION("ADP5520(01) PMIC-MFD Driver");
-MODULE_LICENSE("GPL");
+builtin_i2c_driver(adp5520_driver);
--
2.7.4
next prev parent reply other threads:[~2018-12-07 20:13 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 ` Paul Gortmaker [this message]
2018-12-07 20:24 ` [PATCH 02/18] mfd: adp5520: " 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 ` [PATCH 15/18] mfd: wm831x-core: drop unused module infrastructure from non-modular code Paul Gortmaker
2018-12-10 9:26 ` 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 02/18] mfd: adp5520: Make it explicitly non-modular Paul Gortmaker
2018-12-18 7:43 ` Hennerich, Michael
2019-01-13 18:36 [PATCH v5 00/18] mfd: demodularization of non-modular drivers Paul Gortmaker
2019-01-13 18:36 ` [PATCH 02/18] mfd: adp5520: Make it explicitly non-modular 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-3-git-send-email-paul.gortmaker@windriver.com \
--to=paul.gortmaker@windriver.com \
--cc=lee.jones@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=michael.hennerich@analog.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).