lkml.org 
[lkml]   [2014]   [Nov]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH] next: input: Fix build error seen if input-core is built as module
Date
The following build error may be seen if input-core is built as module:

drivers/input/leds.o: In function `init_module':
leds.c:(.init.text+0x0): multiple definition of `init_module'
drivers/input/input.o:input.c:(.init.text+0x0): first defined here
drivers/input/leds.o: In function `cleanup_module':
leds.c:(.exit.text+0x0): multiple definition of `cleanup_module'
drivers/input/input.o:input.c:(.exit.text+0x0): first defined here
make[2]: *** [drivers/input/input-core.o] Error 1

leds.c is now part of input-core and can therefore not have its own
module initialization code. Initialize it from input.c instead.

Fixes: 6766fb48654c ("input: route kbd LEDs through the generic LEDs layer")
Cc: Samuel Thibault <samuel.thibault@ens-lyon.org>
Cc: John Crispin <blogic@openwrt.org>
Cc: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
---
Problem is seen in linux-next and mmotm.

I am perfectly fine if the patch is merged into the original patch,
or if a different fix for the problem is implemented, as long as it
gets fixed.

drivers/input/input.c | 4 ++++
drivers/input/leds.c | 9 +++------
drivers/input/leds.h | 7 +++++++
3 files changed, 14 insertions(+), 6 deletions(-)
create mode 100644 drivers/input/leds.h

diff --git a/drivers/input/input.c b/drivers/input/input.c
index 0ffaa87..20e3793 100644
--- a/drivers/input/input.c
+++ b/drivers/input/input.c
@@ -28,6 +28,7 @@
#include <linux/mutex.h>
#include <linux/rcupdate.h>
#include "input-compat.h"
+#include "leds.h"

MODULE_AUTHOR("Vojtech Pavlik <vojtech@suse.cz>");
MODULE_DESCRIPTION("Input core");
@@ -2428,6 +2429,8 @@ static int __init input_init(void)
goto fail2;
}

+ input_led_init();
+
return 0;

fail2: input_proc_exit();
@@ -2437,6 +2440,7 @@ static int __init input_init(void)

static void __exit input_exit(void)
{
+ input_led_exit();
input_proc_exit();
unregister_chrdev_region(MKDEV(INPUT_MAJOR, 0),
INPUT_MAX_CHAR_DEVICES);
diff --git a/drivers/input/leds.c b/drivers/input/leds.c
index dca4a50..726570a 100644
--- a/drivers/input/leds.c
+++ b/drivers/input/leds.c
@@ -14,6 +14,7 @@
#include <linux/init.h>
#include <linux/leds.h>
#include <linux/input.h>
+#include "leds.h"

/*
* Keyboard LEDs are propagated by default like the following example:
@@ -255,22 +256,18 @@ void input_led_disconnect(struct input_dev *dev)
mutex_unlock(&vt_led_registered_lock);
}

-static int __init input_led_init(void)
+void __init input_led_init(void)
{
unsigned i;

for (i = 0; i < LED_CNT; i++)
INIT_WORK(&vt_led_work[i], vt_led_cb);
-
- return 0;
}

-static void __exit input_led_exit(void)
+void __exit input_led_exit(void)
{
}

MODULE_LICENSE("GPL");
MODULE_DESCRIPTION("User LED support for input layer");
MODULE_AUTHOR("Samuel Thibault <samuel.thibault@ens-lyon.org>");
-module_init(input_led_init);
-module_exit(input_led_exit);
diff --git a/drivers/input/leds.h b/drivers/input/leds.h
new file mode 100644
index 0000000..d341b6b
--- /dev/null
+++ b/drivers/input/leds.h
@@ -0,0 +1,7 @@
+#ifndef INPUT_LEDS_H
+#define INPUT_LEDS_H
+
+void input_led_init(void);
+void input_led_exit(void);
+
+#endif /* INPUT_LEDS_H */
--
1.9.1


\
 
 \ /
  Last update: 2014-11-03 07:22    [W:0.036 / U:0.416 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site