The patch titled
Subject: Merge input leds init/exit into input module init/exit
has been removed from the -mm tree. Its filename was
input-route-kbd-leds-through-the-generic-leds-layer-fix-3.patch
This patch was dropped because it was folded into input-route-kbd-leds-through-the-generic-leds-layer.patch
------------------------------------------------------
From: Samuel Thibault <samuel.thibault@xxxxxxxxxxxx>
Subject: Merge input leds init/exit into input module init/exit
Now that input/leds.c is compiled into the input.ko module in the mm
tree, its init and exit function must be called by input.ko's init and
exit functions, instead of duplicating the module init/exit hooks, which
leads to the following build error when input is built as a module:
leds.c:(.init.text+0x0): multiple definition of `init_module'
leds.c:(.exit.text+0x0): multiple definition of `cleanup_module'
This also adds a proper clean of the vt_led_work queues in the exit
function.
Signed-off-by: Samuel Thibault <samuel.thibault@xxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/input/input.c | 3 +++
drivers/input/leds.c | 16 ++++++----------
include/linux/input.h | 7 +++++++
3 files changed, 16 insertions(+), 10 deletions(-)
diff -puN drivers/input/input.c~input-route-kbd-leds-through-the-generic-leds-layer-fix-3 drivers/input/input.c
--- a/drivers/input/input.c~input-route-kbd-leds-through-the-generic-leds-layer-fix-3
+++ a/drivers/input/input.c
@@ -2428,6 +2428,8 @@ static int __init input_init(void)
goto fail2;
}
+ input_led_init();
+
return 0;
fail2: input_proc_exit();
@@ -2437,6 +2439,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 -puN drivers/input/leds.c~input-route-kbd-leds-through-the-generic-leds-layer-fix-3 drivers/input/leds.c
--- a/drivers/input/leds.c~input-route-kbd-leds-through-the-generic-leds-layer-fix-3
+++ a/drivers/input/leds.c
@@ -255,22 +255,18 @@ void input_led_disconnect(struct input_d
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)
{
-}
+ unsigned i;
-MODULE_LICENSE("GPL");
-MODULE_DESCRIPTION("User LED support for input layer");
-MODULE_AUTHOR("Samuel Thibault <samuel.thibault@xxxxxxxxxxxx>");
-module_init(input_led_init);
-module_exit(input_led_exit);
+ for (i = 0; i < LED_CNT; i++)
+ cancel_work_sync(&vt_led_work[i]);
+}
diff -puN include/linux/input.h~input-route-kbd-leds-through-the-generic-leds-layer-fix-3 include/linux/input.h
--- a/include/linux/input.h~input-route-kbd-leds-through-the-generic-leds-layer-fix-3
+++ a/include/linux/input.h
@@ -536,11 +536,18 @@ int input_ff_create_memless(struct input
#ifdef CONFIG_INPUT_LEDS
+void input_led_init(void);
+void input_led_exit(void);
+
int input_led_connect(struct input_dev *dev);
void input_led_disconnect(struct input_dev *dev);
#else
+static inline void input_led_init(void) { }
+
+static inline void input_led_exit(void) { }
+
static inline int input_led_connect(struct input_dev *dev)
{
return 0;
_
Patches currently in -mm which might be from samuel.thibault@xxxxxxxxxxxx are
input-route-kbd-leds-through-the-generic-leds-layer.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
