lkml.org 
[lkml]   [2012]   [Sep]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
Subject[PATCH] allow gpiolib to be a module
Without ARCH_REQUIRE_GPIOLIB there's no reason to force this code, when
enabled, to always be built into the kernel, which requires only minor
Makefile and source code adjustments.

Signed-off-by: Jan Beulich <jbeulich@suse.com>

---
drivers/gpio/Kconfig | 2 +-
drivers/gpio/Makefile | 3 ++-
drivers/gpio/gpiolib.c | 15 +++++++++++++++
include/asm-generic/gpio.h | 3 ++-
4 files changed, 20 insertions(+), 3 deletions(-)

--- 3.6-rc5/drivers/gpio/Kconfig
+++ 3.6-rc5-gpiolib-module/drivers/gpio/Kconfig
@@ -33,7 +33,7 @@ config ARCH_REQUIRE_GPIOLIB


menuconfig GPIOLIB
- bool "GPIO Support"
+ tristate "GPIO Support"
depends on ARCH_WANT_OPTIONAL_GPIOLIB || ARCH_REQUIRE_GPIOLIB
select GENERIC_GPIO
help
--- 3.6-rc5/drivers/gpio/Makefile
+++ 3.6-rc5-gpiolib-module/drivers/gpio/Makefile
@@ -2,7 +2,8 @@

ccflags-$(CONFIG_DEBUG_GPIO) += -DDEBUG

-obj-$(CONFIG_GPIOLIB) += gpiolib.o devres.o
+gpio-lib-y := gpiolib.o devres.o
+obj-$(CONFIG_GPIOLIB) += gpio-lib.o
obj-$(CONFIG_OF_GPIO) += gpiolib-of.o

# Device drivers. Generally keep list sorted alphabetically
--- 3.6-rc5/drivers/gpio/gpiolib.c
+++ 3.6-rc5-gpiolib-module/drivers/gpio/gpiolib.c
@@ -1003,7 +1003,9 @@ static int __init gpiolib_sysfs_init(voi

return status;
}
+#ifndef MODULE
postcore_initcall(gpiolib_sysfs_init);
+#endif

#else
static inline int gpiochip_export(struct gpio_chip *chip)
@@ -1832,6 +1834,19 @@ static int __init gpiolib_debugfs_init(v
NULL, NULL, &gpiolib_operations);
return 0;
}
+#ifndef MODULE
subsys_initcall(gpiolib_debugfs_init);
+#endif

#endif /* DEBUG_FS */
+
+#ifdef MODULE
+int __init gpiolib_init(void)
+{
+ return gpiolib_sysfs_init() ?: gpiolib_debugfs_init();
+}
+module_init(gpiolib_init);
+
+MODULE_DESCRIPTION("GPIO library");
+MODULE_LICENSE("GPL");
+#endif
--- 3.6-rc5/include/asm-generic/gpio.h
+++ 3.6-rc5-gpiolib-module/include/asm-generic/gpio.h
@@ -4,9 +4,10 @@
#include <linux/kernel.h>
#include <linux/types.h>
#include <linux/errno.h>
+#include <linux/kconfig.h>
#include <linux/of.h>

-#ifdef CONFIG_GPIOLIB
+#if IS_ENABLED(CONFIG_GPIOLIB)

#include <linux/compiler.h>





\
 
 \ /
  Last update: 2012-09-10 15:01    [W:0.087 / U:2.052 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site