mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Paul Gortmaker <paul.gortmaker@windriver.com>
To: <linux-kernel@vger.kernel.org>
Cc: Paul Gortmaker <paul.gortmaker@windriver.com>,
	Chanwoo Choi <cw00.choi@samsung.com>,
	Krzysztof Kozlowski <k.kozlowski@samsung.com>,
	Samuel Ortiz <sameo@linux.intel.com>,
	Lee Jones <lee.jones@linaro.org>
Subject: [PATCH 6/7] drivers/mfd: make max77693.c explicitly non-modular
Date: Sun, 3 Apr 2016 17:24:18 -0400	[thread overview]
Message-ID: <1459718659-28316-7-git-send-email-paul.gortmaker@windriver.com> (raw)
In-Reply-To: <1459718659-28316-1-git-send-email-paul.gortmaker@windriver.com>

The Kconfig currently controlling compilation of this code is:

drivers/mfd/Kconfig:config MFD_MAX77693
drivers/mfd/Kconfig:    bool "Maxim Semiconductor MAX77693 PMIC 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_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
was contained at the top of the file in the comments.

Cc: Chanwoo Choi <cw00.choi@samsung.com>
Cc: Krzysztof Kozlowski <k.kozlowski@samsung.com>
Cc: Samuel Ortiz <sameo@linux.intel.com>
Cc: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
---
 drivers/mfd/max77693.c | 34 +++-------------------------------
 1 file changed, 3 insertions(+), 31 deletions(-)

diff --git a/drivers/mfd/max77693.c b/drivers/mfd/max77693.c
index b83b7a7da1ae..4126a55269d2 100644
--- a/drivers/mfd/max77693.c
+++ b/drivers/mfd/max77693.c
@@ -2,7 +2,7 @@
  * max77693.c - mfd core driver for the MAX 77693
  *
  * Copyright (C) 2012 Samsung Electronics
- * SangYoung Son <hello.son@smasung.com>
+ * SangYoung Son <hello.son@samsung.com>
  *
  * This program is not provided / owned by Maxim Integrated Products.
  *
@@ -23,7 +23,7 @@
  * This driver is based on max8997.c
  */
 
-#include <linux/module.h>
+#include <linux/init.h>
 #include <linux/slab.h>
 #include <linux/i2c.h>
 #include <linux/err.h>
@@ -309,28 +309,10 @@ err_i2c_haptic:
 	return ret;
 }
 
-static int max77693_i2c_remove(struct i2c_client *i2c)
-{
-	struct max77693_dev *max77693 = i2c_get_clientdata(i2c);
-
-	mfd_remove_devices(max77693->dev);
-
-	regmap_del_irq_chip(max77693->irq, max77693->irq_data_muic);
-	regmap_del_irq_chip(max77693->irq, max77693->irq_data_chg);
-	regmap_del_irq_chip(max77693->irq, max77693->irq_data_topsys);
-	regmap_del_irq_chip(max77693->irq, max77693->irq_data_led);
-
-	i2c_unregister_device(max77693->i2c_muic);
-	i2c_unregister_device(max77693->i2c_haptic);
-
-	return 0;
-}
-
 static const struct i2c_device_id max77693_i2c_id[] = {
 	{ "max77693", TYPE_MAX77693 },
 	{ }
 };
-MODULE_DEVICE_TABLE(i2c, max77693_i2c_id);
 
 static int max77693_suspend(struct device *dev)
 {
@@ -374,10 +356,10 @@ static struct i2c_driver max77693_i2c_driver = {
 	.driver = {
 		   .name = "max77693",
 		   .pm = &max77693_pm,
+		   .suppress_bind_attrs = true,
 		   .of_match_table = of_match_ptr(max77693_dt_match),
 	},
 	.probe = max77693_i2c_probe,
-	.remove = max77693_i2c_remove,
 	.id_table = max77693_i2c_id,
 };
 
@@ -387,13 +369,3 @@ static int __init max77693_i2c_init(void)
 }
 /* init early so consumer devices can complete system boot */
 subsys_initcall(max77693_i2c_init);
-
-static void __exit max77693_i2c_exit(void)
-{
-	i2c_del_driver(&max77693_i2c_driver);
-}
-module_exit(max77693_i2c_exit);
-
-MODULE_DESCRIPTION("MAXIM 77693 multi-function core driver");
-MODULE_AUTHOR("SangYoung, Son <hello.son@samsung.com>");
-MODULE_LICENSE("GPL");
-- 
2.8.0

  parent reply	other threads:[~2016-04-03 21:24 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-04-03 21:24 [PATCH 0/7] drivers/mfd: make max drivers " Paul Gortmaker
2016-04-03 21:24 ` [PATCH 1/7] drivers/mfd: make max8925-i2c.c " Paul Gortmaker
2016-04-03 21:24 ` [PATCH 2/7] drivers/mfd: make max8997.c " Paul Gortmaker
2016-04-03 21:24 ` [PATCH 3/7] drivers/mfd: make max8998.c " Paul Gortmaker
2016-04-03 21:24 ` [PATCH 4/7] drivers/mfd: make max14577.c " Paul Gortmaker
2016-04-04  3:42   ` Krzysztof Kozlowski
2016-04-04 15:09     ` Paul Gortmaker
2016-04-05 14:24     ` Javier Martinez Canillas
2016-04-03 21:24 ` [PATCH 5/7] drivers/mfd: make max77686.c " Paul Gortmaker
2016-04-04  3:44   ` Krzysztof Kozlowski
2016-04-04 15:08     ` Paul Gortmaker
2016-04-04 15:21     ` Javier Martinez Canillas
2016-04-03 21:24 ` Paul Gortmaker [this message]
2016-04-04  3:53   ` [PATCH 6/7] drivers/mfd: make max77693.c " Krzysztof Kozlowski
2016-04-04 15:39     ` Paul Gortmaker
2016-04-05  2:06       ` Krzysztof Kozlowski
2016-04-03 21:24 ` [PATCH 7/7] drivers/mfd: make max77843.c " Paul Gortmaker
2016-04-04  8:11 ` [PATCH 0/7] drivers/mfd: make max drivers " Lee Jones
2016-04-04 13:51   ` Paul Gortmaker
2016-04-04 14:21     ` 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=1459718659-28316-7-git-send-email-paul.gortmaker@windriver.com \
    --to=paul.gortmaker@windriver.com \
    --cc=cw00.choi@samsung.com \
    --cc=k.kozlowski@samsung.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

Powered by JetHome