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>,
	Tony Lindgren <tony@atomide.com>,
	Graeme Gregory <gg@slimlogic.co.uk>,
	linux-omap@vger.kernel.org
Subject: [PATCH 17/18] mfd: palmas: Make it explicitly non-modular
Date: Wed, 18 Dec 2019 15:48:56 -0500	[thread overview]
Message-ID: <1576702137-25905-18-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_PALMAS
drivers/mfd/Kconfig:    bool "TI Palmas series 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.

We delete the include of module.h as well as an unused instance of
moduleparam.h include as well.

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: Tony Lindgren <tony@atomide.com>
Cc: Lee Jones <lee.jones@linaro.org>
Cc: Graeme Gregory <gg@slimlogic.co.uk>
Cc: linux-omap@vger.kernel.org
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
---
 drivers/mfd/palmas.c | 36 +-----------------------------------
 1 file changed, 1 insertion(+), 35 deletions(-)

diff --git a/drivers/mfd/palmas.c b/drivers/mfd/palmas.c
index f5b3fa973b13..0e96c5cd02c6 100644
--- a/drivers/mfd/palmas.c
+++ b/drivers/mfd/palmas.c
@@ -7,8 +7,6 @@
  * Author: Graeme Gregory <gg@slimlogic.co.uk>
  */
 
-#include <linux/module.h>
-#include <linux/moduleparam.h>
 #include <linux/init.h>
 #include <linux/slab.h>
 #include <linux/i2c.h>
@@ -500,7 +498,6 @@ static const struct of_device_id of_palmas_match_tbl[] = {
 	},
 	{ },
 };
-MODULE_DEVICE_TABLE(of, of_palmas_match_tbl);
 
 static int palmas_i2c_probe(struct i2c_client *i2c,
 			    const struct i2c_device_id *id)
@@ -700,26 +697,6 @@ static int palmas_i2c_probe(struct i2c_client *i2c,
 	return ret;
 }
 
-static int palmas_i2c_remove(struct i2c_client *i2c)
-{
-	struct palmas *palmas = i2c_get_clientdata(i2c);
-	int i;
-
-	regmap_del_irq_chip(palmas->irq, palmas->irq_data);
-
-	for (i = 1; i < PALMAS_NUM_CLIENTS; i++) {
-		if (palmas->i2c_clients[i])
-			i2c_unregister_device(palmas->i2c_clients[i]);
-	}
-
-	if (palmas == palmas_dev) {
-		pm_power_off = NULL;
-		palmas_dev = NULL;
-	}
-
-	return 0;
-}
-
 static const struct i2c_device_id palmas_i2c_id[] = {
 	{ "palmas", },
 	{ "twl6035", },
@@ -727,15 +704,14 @@ static const struct i2c_device_id palmas_i2c_id[] = {
 	{ "tps65913", },
 	{ /* end */ }
 };
-MODULE_DEVICE_TABLE(i2c, palmas_i2c_id);
 
 static struct i2c_driver palmas_i2c_driver = {
 	.driver = {
 		   .name = "palmas",
 		   .of_match_table = of_palmas_match_tbl,
+		   .suppress_bind_attrs = true,
 	},
 	.probe = palmas_i2c_probe,
-	.remove = palmas_i2c_remove,
 	.id_table = palmas_i2c_id,
 };
 
@@ -745,13 +721,3 @@ static int __init palmas_i2c_init(void)
 }
 /* init early so consumer devices can complete system boot */
 subsys_initcall(palmas_i2c_init);
-
-static void __exit palmas_i2c_exit(void)
-{
-	i2c_del_driver(&palmas_i2c_driver);
-}
-module_exit(palmas_i2c_exit);
-
-MODULE_AUTHOR("Graeme Gregory <gg@slimlogic.co.uk>");
-MODULE_DESCRIPTION("Palmas chip family multi-function driver");
-MODULE_LICENSE("GPL");
-- 
2.7.4


  parent reply	other threads:[~2019-12-18 20:49 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 ` [PATCH 14/18] mfd: tps6586x: " Paul Gortmaker
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 ` Paul Gortmaker [this message]
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-18-git-send-email-paul.gortmaker@windriver.com \
    --to=paul.gortmaker@windriver.com \
    --cc=gg@slimlogic.co.uk \
    --cc=lee.jones@linaro.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-omap@vger.kernel.org \
    --cc=tony@atomide.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