public inbox for linux-kernel@vger.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>,
	Mike Rapoport <mike@compulab.co.il>
Subject: [PATCH 14/18] mfd: tps6586x: Make it explicitly non-modular
Date: Wed, 18 Dec 2019 15:48:53 -0500	[thread overview]
Message-ID: <1576702137-25905-15-git-send-email-paul.gortmaker@windriver.com> (raw)
In-Reply-To: <1576702137-25905-1-git-send-email-paul.gortmaker@windriver.com>

The Kconfig currently controlling compilation of this code is:

drivers/mfd/Kconfig:config MFD_TPS6586X
drivers/mfd/Kconfig:    bool "TI TPS6586x Power Management chips"

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

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: Mike Rapoport <mike@compulab.co.il>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
---
 drivers/mfd/tps6586x.c | 26 ++------------------------
 1 file changed, 2 insertions(+), 24 deletions(-)

diff --git a/drivers/mfd/tps6586x.c b/drivers/mfd/tps6586x.c
index c8aadd39324e..d7db10d34193 100644
--- a/drivers/mfd/tps6586x.c
+++ b/drivers/mfd/tps6586x.c
@@ -16,7 +16,7 @@
 #include <linux/irq.h>
 #include <linux/irqdomain.h>
 #include <linux/kernel.h>
-#include <linux/module.h>
+#include <linux/init.h>
 #include <linux/mutex.h>
 #include <linux/slab.h>
 #include <linux/err.h>
@@ -578,17 +578,6 @@ static int tps6586x_i2c_probe(struct i2c_client *client,
 	return ret;
 }
 
-static int tps6586x_i2c_remove(struct i2c_client *client)
-{
-	struct tps6586x *tps6586x = i2c_get_clientdata(client);
-
-	tps6586x_remove_subdevs(tps6586x);
-	mfd_remove_devices(tps6586x->dev);
-	if (client->irq)
-		free_irq(client->irq, tps6586x);
-	return 0;
-}
-
 static int __maybe_unused tps6586x_i2c_suspend(struct device *dev)
 {
 	struct tps6586x *tps6586x = dev_get_drvdata(dev);
@@ -616,16 +605,15 @@ static const struct i2c_device_id tps6586x_id_table[] = {
 	{ "tps6586x", 0 },
 	{ },
 };
-MODULE_DEVICE_TABLE(i2c, tps6586x_id_table);
 
 static struct i2c_driver tps6586x_driver = {
 	.driver	= {
 		.name	= "tps6586x",
 		.of_match_table = of_match_ptr(tps6586x_of_match),
 		.pm	= &tps6586x_pm_ops,
+		.suppress_bind_attrs = true,
 	},
 	.probe		= tps6586x_i2c_probe,
-	.remove		= tps6586x_i2c_remove,
 	.id_table	= tps6586x_id_table,
 };
 
@@ -634,13 +622,3 @@ static int __init tps6586x_init(void)
 	return i2c_add_driver(&tps6586x_driver);
 }
 subsys_initcall(tps6586x_init);
-
-static void __exit tps6586x_exit(void)
-{
-	i2c_del_driver(&tps6586x_driver);
-}
-module_exit(tps6586x_exit);
-
-MODULE_DESCRIPTION("TPS6586X core driver");
-MODULE_AUTHOR("Mike Rapoport <mike@compulab.co.il>");
-MODULE_LICENSE("GPL");
-- 
2.7.4


  parent reply	other threads:[~2019-12-18 20:50 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-12-18 20:48 [PATCH 00/18] mfd: demodularization of non-modular drivers Paul Gortmaker
2019-12-18 20:48 ` [PATCH 01/18] mfd: stmpe-spi: Make it explicitly non-modular Paul Gortmaker
2019-12-18 20:48 ` [PATCH 02/18] mfd: stmpe-i2c: " Paul Gortmaker
2019-12-18 20:48 ` [PATCH 03/18] mfd: ezx-pcap: " Paul Gortmaker
2019-12-18 20:48 ` [PATCH 04/18] mfd: 88pm860x-*: " Paul Gortmaker
2019-12-18 20:48 ` [PATCH 05/18] mfd: tc3589: " Paul Gortmaker
2019-12-18 20:48 ` [PATCH 06/18] mfd: tc6387xb: " Paul Gortmaker
2019-12-18 20:48 ` [PATCH 07/18] mfd: tc6393xb: " Paul Gortmaker
2019-12-18 20:48 ` [PATCH 08/18] mfd: twl4030-audio: " Paul Gortmaker
2019-12-20  8:43   ` Peter Ujfalusi
2019-12-18 20:48 ` [PATCH 09/18] mfd: twl4030-power: " Paul Gortmaker
2019-12-18 20:48 ` [PATCH 10/18] mfd: twl6040: " Paul Gortmaker
2019-12-18 20:48 ` [PATCH 11/18] mfd: t7l66xb: " Paul Gortmaker
2019-12-18 20:48 ` [PATCH 12/18] mfd: lp8788: " Paul Gortmaker
2019-12-18 20:48 ` [PATCH 13/18] mfd: menelaus: " Paul Gortmaker
2019-12-18 20:48 ` Paul Gortmaker [this message]
2019-12-18 20:48 ` [PATCH 15/18] mfd: omap-usb-tll: " Paul Gortmaker
2019-12-18 20:48 ` [PATCH 16/18] mfd: omap-usb-host: " Paul Gortmaker
2019-12-18 20:48 ` [PATCH 17/18] mfd: palmas: " Paul Gortmaker
2019-12-18 20:48 ` [PATCH 18/18] mfd: intel_soc_pmic_core: " 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=1576702137-25905-15-git-send-email-paul.gortmaker@windriver.com \
    --to=paul.gortmaker@windriver.com \
    --cc=lee.jones@linaro.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mike@compulab.co.il \
    /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