Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1365129

[PATCH 3/9] drivers/gpio: make gpio-mc9s08dz60.c explicitly non-modular

Show all headers | View raw

The Kconfig currently controlling compilation of this code is:

drivers/gpio/Kconfig:config GPIO_MC9S08DZ60
drivers/gpio/Kconfig:   bool "MX35 3DS BOARD MC9S08DZ60 GPIO functions"

...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: Linus Walleij <linus.walleij@linaro.org>
Cc: Alexandre Courbot <gnurou@gmail.com>
Cc: Wu Guoxing <b39297@freescale.com>
Cc: linux-gpio@vger.kernel.org
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
---
 drivers/gpio/gpio-mc9s08dz60.c | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/drivers/gpio/gpio-mc9s08dz60.c b/drivers/gpio/gpio-mc9s08dz60.c
index 14f252f9eb29..2fcad5b9cca5 100644
--- a/drivers/gpio/gpio-mc9s08dz60.c
+++ b/drivers/gpio/gpio-mc9s08dz60.c
@@ -15,7 +15,7 @@
  */
 
 #include <linux/kernel.h>
-#include <linux/module.h>
+#include <linux/init.h>
 #include <linux/slab.h>
 #include <linux/i2c.h>
 #include <linux/gpio.h>
@@ -111,8 +111,6 @@ static const struct i2c_device_id mc9s08dz60_id[] = {
 	{},
 };
 
-MODULE_DEVICE_TABLE(i2c, mc9s08dz60_id);
-
 static struct i2c_driver mc9s08dz60_i2c_driver = {
 	.driver = {
 		.name = "mc9s08dz60",
@@ -120,10 +118,4 @@ static struct i2c_driver mc9s08dz60_i2c_driver = {
 	.probe = mc9s08dz60_probe,
 	.id_table = mc9s08dz60_id,
 };
-
-module_i2c_driver(mc9s08dz60_i2c_driver);
-
-MODULE_AUTHOR("Freescale Semiconductor, Inc. "
-		"Wu Guoxing <b39297@freescale.com>");
-MODULE_DESCRIPTION("mc9s08dz60 gpio function on mx35 3ds board");
-MODULE_LICENSE("GPL v2");
+builtin_i2c_driver(mc9s08dz60_i2c_driver);
-- 
2.6.1

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH 0/9] gpio: batch #1: remove modular usage from non-modular drivers Paul Gortmaker <paul.gortmaker@windriver.com> - 2016-03-27 17:50 +0200
  [PATCH 7/9] drivers/gpio: make gpio-sta2x11.c explicitly non-modular Paul Gortmaker <paul.gortmaker@windriver.com> - 2016-03-27 17:50 +0200
  [PATCH 3/9] drivers/gpio: make gpio-mc9s08dz60.c explicitly non-modular Paul Gortmaker <paul.gortmaker@windriver.com> - 2016-03-27 17:50 +0200
  [PATCH 2/9] drivers/gpio: make gpio-mb86s7x.c driver explicitly non-modular Paul Gortmaker <paul.gortmaker@windriver.com> - 2016-03-27 17:50 +0200
  [PATCH 6/9] drivers/gpio: make gpio-pl061.c explicitly non-modular Paul Gortmaker <paul.gortmaker@windriver.com> - 2016-03-27 17:50 +0200
    Re: [PATCH 6/9] drivers/gpio: make gpio-pl061.c explicitly  non-modular Baruch Siach <baruch@tkos.co.il> - 2016-03-27 19:50 +0200
    Re: [PATCH 6/9] drivers/gpio: make gpio-pl061.c explicitly non-modular Linus Walleij <linus.walleij@linaro.org> - 2016-03-31 15:10 +0200
  [PATCH 9/9] drivers/gpio: make gpio-zx.c explicitly non-modular Paul Gortmaker <paul.gortmaker@windriver.com> - 2016-03-27 17:50 +0200
  [PATCH 5/9] drivers/gpio: make gpio-mvebu.c explicitly non-modular Paul Gortmaker <paul.gortmaker@windriver.com> - 2016-03-27 17:50 +0200
  [PATCH 1/9] drivers/gpio: make gpio-bcm-kona.c explicitly non-modular Paul Gortmaker <paul.gortmaker@windriver.com> - 2016-03-27 17:50 +0200
    Re: [PATCH 1/9] drivers/gpio: make gpio-bcm-kona.c explicitly non-modular Linus Walleij <linus.walleij@linaro.org> - 2016-03-31 12:10 +0200
  [PATCH 4/9] drivers/gpio: make gpio-moxart.c explicitly non-modular Paul Gortmaker <paul.gortmaker@windriver.com> - 2016-03-27 17:50 +0200
  Re: [PATCH 0/9] gpio: batch #1: remove modular usage from non-modular drivers Linus Walleij <linus.walleij@linaro.org> - 2016-03-31 15:20 +0200

csiph-web