Commit d7b5247b authored by Kay Sievers's avatar Kay Sievers Committed by Dmitry Torokhov

Input: add MODULE_ALIAS() to hotpluggable platform modules

Since 43cc71ee, the platform modalias
is prefixed with "platform:". Add MODULE_ALIAS() to the hotpluggable
"input" platform drivers, to re-enable auto loading.

[dbrownell@users.sourceforge.net: more drivers, registration fixes]
Signed-off-by: default avatarKay Sievers <kay.sievers@vrfy.org>
Signed-off-by: default avatarDavid Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: default avatarDmitry Torokhov <dtor@mail.ru>
parent b39b0440
...@@ -156,11 +156,15 @@ static int __devexit aaedkbd_remove(struct platform_device *pdev) ...@@ -156,11 +156,15 @@ static int __devexit aaedkbd_remove(struct platform_device *pdev)
return 0; return 0;
} }
/* work with hotplug and coldplug */
MODULE_ALIAS("platform:aaed2000-keyboard");
static struct platform_driver aaedkbd_driver = { static struct platform_driver aaedkbd_driver = {
.probe = aaedkbd_probe, .probe = aaedkbd_probe,
.remove = __devexit_p(aaedkbd_remove), .remove = __devexit_p(aaedkbd_remove),
.driver = { .driver = {
.name = "aaed2000-keyboard", .name = "aaed2000-keyboard",
.owner = THIS_MODULE,
}, },
}; };
......
...@@ -359,6 +359,7 @@ struct platform_driver bfin_kpad_device_driver = { ...@@ -359,6 +359,7 @@ struct platform_driver bfin_kpad_device_driver = {
.remove = __devexit_p(bfin_kpad_remove), .remove = __devexit_p(bfin_kpad_remove),
.driver = { .driver = {
.name = DRV_NAME, .name = DRV_NAME,
.owner = THIS_MODULE,
} }
}; };
...@@ -378,3 +379,4 @@ module_exit(bfin_kpad_exit); ...@@ -378,3 +379,4 @@ module_exit(bfin_kpad_exit);
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_AUTHOR("Michael Hennerich <hennerich@blackfin.uclinux.org>"); MODULE_AUTHOR("Michael Hennerich <hennerich@blackfin.uclinux.org>");
MODULE_DESCRIPTION("Keypad driver for BF54x Processors"); MODULE_DESCRIPTION("Keypad driver for BF54x Processors");
MODULE_ALIAS("platform:bf54x-keys");
...@@ -392,6 +392,7 @@ static struct platform_driver corgikbd_driver = { ...@@ -392,6 +392,7 @@ static struct platform_driver corgikbd_driver = {
.resume = corgikbd_resume, .resume = corgikbd_resume,
.driver = { .driver = {
.name = "corgi-keyboard", .name = "corgi-keyboard",
.owner = THIS_MODULE,
}, },
}; };
...@@ -411,3 +412,4 @@ module_exit(corgikbd_exit); ...@@ -411,3 +412,4 @@ module_exit(corgikbd_exit);
MODULE_AUTHOR("Richard Purdie <rpurdie@rpsys.net>"); MODULE_AUTHOR("Richard Purdie <rpurdie@rpsys.net>");
MODULE_DESCRIPTION("Corgi Keyboard Driver"); MODULE_DESCRIPTION("Corgi Keyboard Driver");
MODULE_LICENSE("GPLv2"); MODULE_LICENSE("GPLv2");
MODULE_ALIAS("platform:corgi-keyboard");
...@@ -214,6 +214,7 @@ struct platform_driver gpio_keys_device_driver = { ...@@ -214,6 +214,7 @@ struct platform_driver gpio_keys_device_driver = {
.resume = gpio_keys_resume, .resume = gpio_keys_resume,
.driver = { .driver = {
.name = "gpio-keys", .name = "gpio-keys",
.owner = THIS_MODULE,
} }
}; };
...@@ -233,3 +234,4 @@ module_exit(gpio_keys_exit); ...@@ -233,3 +234,4 @@ module_exit(gpio_keys_exit);
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_AUTHOR("Phil Blundell <pb@handhelds.org>"); MODULE_AUTHOR("Phil Blundell <pb@handhelds.org>");
MODULE_DESCRIPTION("Keyboard driver for CPU GPIOs"); MODULE_DESCRIPTION("Keyboard driver for CPU GPIOs");
MODULE_ALIAS("platform:gpio-keys");
...@@ -254,6 +254,7 @@ static int __devexit jornada680kbd_remove(struct platform_device *pdev) ...@@ -254,6 +254,7 @@ static int __devexit jornada680kbd_remove(struct platform_device *pdev)
static struct platform_driver jornada680kbd_driver = { static struct platform_driver jornada680kbd_driver = {
.driver = { .driver = {
.name = "jornada680_kbd", .name = "jornada680_kbd",
.owner = THIS_MODULE,
}, },
.probe = jornada680kbd_probe, .probe = jornada680kbd_probe,
.remove = __devexit_p(jornada680kbd_remove), .remove = __devexit_p(jornada680kbd_remove),
...@@ -275,3 +276,4 @@ module_exit(jornada680kbd_exit); ...@@ -275,3 +276,4 @@ module_exit(jornada680kbd_exit);
MODULE_AUTHOR("Kristoffer Ericson <kristoffer.ericson@gmail.com>"); MODULE_AUTHOR("Kristoffer Ericson <kristoffer.ericson@gmail.com>");
MODULE_DESCRIPTION("HP Jornada 620/660/680/690 Keyboard Driver"); MODULE_DESCRIPTION("HP Jornada 620/660/680/690 Keyboard Driver");
MODULE_LICENSE("GPLv2"); MODULE_LICENSE("GPLv2");
MODULE_ALIAS("platform:jornada680_kbd");
...@@ -162,9 +162,13 @@ static int __devexit jornada720_kbd_remove(struct platform_device *pdev) ...@@ -162,9 +162,13 @@ static int __devexit jornada720_kbd_remove(struct platform_device *pdev)
return 0; return 0;
} }
/* work with hotplug and coldplug */
MODULE_ALIAS("platform:jornada720_kbd");
static struct platform_driver jornada720_kbd_driver = { static struct platform_driver jornada720_kbd_driver = {
.driver = { .driver = {
.name = "jornada720_kbd", .name = "jornada720_kbd",
.owner = THIS_MODULE,
}, },
.probe = jornada720_kbd_probe, .probe = jornada720_kbd_probe,
.remove = __devexit_p(jornada720_kbd_remove), .remove = __devexit_p(jornada720_kbd_remove),
......
...@@ -467,6 +467,7 @@ static struct platform_driver omap_kp_driver = { ...@@ -467,6 +467,7 @@ static struct platform_driver omap_kp_driver = {
.resume = omap_kp_resume, .resume = omap_kp_resume,
.driver = { .driver = {
.name = "omap-keypad", .name = "omap-keypad",
.owner = THIS_MODULE,
}, },
}; };
...@@ -487,3 +488,4 @@ module_exit(omap_kp_exit); ...@@ -487,3 +488,4 @@ module_exit(omap_kp_exit);
MODULE_AUTHOR("Timo Teräs"); MODULE_AUTHOR("Timo Teräs");
MODULE_DESCRIPTION("OMAP Keypad Driver"); MODULE_DESCRIPTION("OMAP Keypad Driver");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_ALIAS("platform:omap-keypad");
...@@ -545,6 +545,9 @@ static int __devexit pxa27x_keypad_remove(struct platform_device *pdev) ...@@ -545,6 +545,9 @@ static int __devexit pxa27x_keypad_remove(struct platform_device *pdev)
return 0; return 0;
} }
/* work with hotplug and coldplug */
MODULE_ALIAS("platform:pxa27x-keypad");
static struct platform_driver pxa27x_keypad_driver = { static struct platform_driver pxa27x_keypad_driver = {
.probe = pxa27x_keypad_probe, .probe = pxa27x_keypad_probe,
.remove = __devexit_p(pxa27x_keypad_remove), .remove = __devexit_p(pxa27x_keypad_remove),
...@@ -552,6 +555,7 @@ static struct platform_driver pxa27x_keypad_driver = { ...@@ -552,6 +555,7 @@ static struct platform_driver pxa27x_keypad_driver = {
.resume = pxa27x_keypad_resume, .resume = pxa27x_keypad_resume,
.driver = { .driver = {
.name = "pxa27x-keypad", .name = "pxa27x-keypad",
.owner = THIS_MODULE,
}, },
}; };
......
...@@ -494,3 +494,4 @@ module_exit(spitzkbd_exit); ...@@ -494,3 +494,4 @@ module_exit(spitzkbd_exit);
MODULE_AUTHOR("Richard Purdie <rpurdie@rpsys.net>"); MODULE_AUTHOR("Richard Purdie <rpurdie@rpsys.net>");
MODULE_DESCRIPTION("Spitz Keyboard Driver"); MODULE_DESCRIPTION("Spitz Keyboard Driver");
MODULE_LICENSE("GPLv2"); MODULE_LICENSE("GPLv2");
MODULE_ALIAS("platform:spitz-keyboard");
...@@ -409,6 +409,7 @@ static struct platform_driver tosakbd_driver = { ...@@ -409,6 +409,7 @@ static struct platform_driver tosakbd_driver = {
.resume = tosakbd_resume, .resume = tosakbd_resume,
.driver = { .driver = {
.name = "tosa-keyboard", .name = "tosa-keyboard",
.owner = THIS_MODULE,
}, },
}; };
...@@ -428,3 +429,4 @@ module_exit(tosakbd_exit); ...@@ -428,3 +429,4 @@ module_exit(tosakbd_exit);
MODULE_AUTHOR("Dirk Opfer <Dirk@Opfer-Online.de>"); MODULE_AUTHOR("Dirk Opfer <Dirk@Opfer-Online.de>");
MODULE_DESCRIPTION("Tosa Keyboard Driver"); MODULE_DESCRIPTION("Tosa Keyboard Driver");
MODULE_LICENSE("GPL v2"); MODULE_LICENSE("GPL v2");
MODULE_ALIAS("platform:tosa-keyboard");
...@@ -148,6 +148,9 @@ static int __devexit cobalt_buttons_remove(struct platform_device *pdev) ...@@ -148,6 +148,9 @@ static int __devexit cobalt_buttons_remove(struct platform_device *pdev)
return 0; return 0;
} }
/* work with hotplug and coldplug */
MODULE_ALIAS("platform:Cobalt buttons");
static struct platform_driver cobalt_buttons_driver = { static struct platform_driver cobalt_buttons_driver = {
.probe = cobalt_buttons_probe, .probe = cobalt_buttons_probe,
.remove = __devexit_p(cobalt_buttons_remove), .remove = __devexit_p(cobalt_buttons_remove),
......
...@@ -171,10 +171,14 @@ static int __devexit gpio_mouse_remove(struct platform_device *pdev) ...@@ -171,10 +171,14 @@ static int __devexit gpio_mouse_remove(struct platform_device *pdev)
return 0; return 0;
} }
/* work with hotplug and coldplug */
MODULE_ALIAS("platform:gpio_mouse");
struct platform_driver gpio_mouse_device_driver = { struct platform_driver gpio_mouse_device_driver = {
.remove = __devexit_p(gpio_mouse_remove), .remove = __devexit_p(gpio_mouse_remove),
.driver = { .driver = {
.name = "gpio_mouse", .name = "gpio_mouse",
.owner = THIS_MODULE,
} }
}; };
......
...@@ -45,6 +45,7 @@ ...@@ -45,6 +45,7 @@
MODULE_AUTHOR("Vojtech Pavlik, Russell King"); MODULE_AUTHOR("Vojtech Pavlik, Russell King");
MODULE_DESCRIPTION("Acorn RiscPC PS/2 keyboard controller driver"); MODULE_DESCRIPTION("Acorn RiscPC PS/2 keyboard controller driver");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_ALIAS("platform:kart");
static int rpckbd_write(struct serio *port, unsigned char val) static int rpckbd_write(struct serio *port, unsigned char val)
{ {
...@@ -140,6 +141,7 @@ static struct platform_driver rpckbd_driver = { ...@@ -140,6 +141,7 @@ static struct platform_driver rpckbd_driver = {
.remove = __devexit_p(rpckbd_remove), .remove = __devexit_p(rpckbd_remove),
.driver = { .driver = {
.name = "kart", .name = "kart",
.owner = THIS_MODULE,
}, },
}; };
......
...@@ -361,6 +361,7 @@ static struct platform_driver corgits_driver = { ...@@ -361,6 +361,7 @@ static struct platform_driver corgits_driver = {
.resume = corgits_resume, .resume = corgits_resume,
.driver = { .driver = {
.name = "corgi-ts", .name = "corgi-ts",
.owner = THIS_MODULE,
}, },
}; };
...@@ -380,3 +381,4 @@ module_exit(corgits_exit); ...@@ -380,3 +381,4 @@ module_exit(corgits_exit);
MODULE_AUTHOR("Richard Purdie <rpurdie@rpsys.net>"); MODULE_AUTHOR("Richard Purdie <rpurdie@rpsys.net>");
MODULE_DESCRIPTION("Corgi TouchScreen Driver"); MODULE_DESCRIPTION("Corgi TouchScreen Driver");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_ALIAS("platform:corgi-ts");
...@@ -160,11 +160,15 @@ static int __devexit jornada720_ts_remove(struct platform_device *pdev) ...@@ -160,11 +160,15 @@ static int __devexit jornada720_ts_remove(struct platform_device *pdev)
return 0; return 0;
} }
/* work with hotplug and coldplug */
MODULE_ALIAS("platform:jornada_ts");
static struct platform_driver jornada720_ts_driver = { static struct platform_driver jornada720_ts_driver = {
.probe = jornada720_ts_probe, .probe = jornada720_ts_probe,
.remove = __devexit_p(jornada720_ts_remove), .remove = __devexit_p(jornada720_ts_remove),
.driver = { .driver = {
.name = "jornada_ts", .name = "jornada_ts",
.owner = THIS_MODULE,
}, },
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment