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

Groups > linux.kernel > #1365131

[PATCH 6/9] drivers/gpio: make gpio-pl061.c explicitly non-modular

Show all headers | View raw

The Kconfig for this driver is currently:

config GPIO_PL061
        bool "PrimeCell PL061 GPIO support"

...meaning that it currently is not being built as a module by anyone.
Lets remove the couple traces of modularity, so that when reading the
driver there is no doubt it is builtin-only.

Since module_init translates to device_initcall in the non-modular
case, the init ordering remains unchanged with this commit.

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: Linus Walleij <linus.walleij@linaro.org>
Cc: Alexandre Courbot <gnurou@gmail.com>
Cc: Baruch Siach <baruch@tkos.co.il>
Cc: linux-gpio@vger.kernel.org
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
---
 drivers/gpio/gpio-pl061.c | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/drivers/gpio/gpio-pl061.c b/drivers/gpio/gpio-pl061.c
index 5cb38212bbc0..9afb415a5d24 100644
--- a/drivers/gpio/gpio-pl061.c
+++ b/drivers/gpio/gpio-pl061.c
@@ -1,6 +1,8 @@
 /*
  * Copyright (C) 2008, 2009 Provigent Ltd.
  *
+ * Author: Baruch Siach <baruch@tkos.co.il>
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
  * published by the Free Software Foundation.
@@ -11,7 +13,7 @@
  */
 #include <linux/spinlock.h>
 #include <linux/errno.h>
-#include <linux/module.h>
+#include <linux/init.h>
 #include <linux/io.h>
 #include <linux/ioport.h>
 #include <linux/interrupt.h>
@@ -429,8 +431,6 @@ static struct amba_id pl061_ids[] = {
 	{ 0, 0 },
 };
 
-MODULE_DEVICE_TABLE(amba, pl061_ids);
-
 static struct amba_driver pl061_gpio_driver = {
 	.drv = {
 		.name	= "pl061_gpio",
@@ -446,8 +446,4 @@ static int __init pl061_gpio_init(void)
 {
 	return amba_driver_register(&pl061_gpio_driver);
 }
-module_init(pl061_gpio_init);
-
-MODULE_AUTHOR("Baruch Siach <baruch@tkos.co.il>");
-MODULE_DESCRIPTION("PL061 GPIO driver");
-MODULE_LICENSE("GPL");
+device_initcall(pl061_gpio_init);
-- 
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