diff options
author | Kay Sievers <kay.sievers@vrfy.org> | 2008-04-18 00:24:42 -0400 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2008-04-24 13:24:59 -0400 |
commit | d7b5247bbcfba2bc96d4b3dec9086a4f1a31363b (patch) | |
tree | a5783cceafbf50812fade605fba0b12e1b02cf0b /drivers/input/keyboard | |
parent | b39b04403bba4f807ee6e57ae2f4407187588fcd (diff) |
Input: add MODULE_ALIAS() to hotpluggable platform modules
Since 43cc71eed1250755986da4c0f9898f9a635cb3bf, 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: Kay Sievers <kay.sievers@vrfy.org>
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Diffstat (limited to 'drivers/input/keyboard')
-rw-r--r-- | drivers/input/keyboard/aaed2000_kbd.c | 4 | ||||
-rw-r--r-- | drivers/input/keyboard/bf54x-keys.c | 2 | ||||
-rw-r--r-- | drivers/input/keyboard/corgikbd.c | 2 | ||||
-rw-r--r-- | drivers/input/keyboard/gpio_keys.c | 2 | ||||
-rw-r--r-- | drivers/input/keyboard/jornada680_kbd.c | 2 | ||||
-rw-r--r-- | drivers/input/keyboard/jornada720_kbd.c | 4 | ||||
-rw-r--r-- | drivers/input/keyboard/omap-keypad.c | 2 | ||||
-rw-r--r-- | drivers/input/keyboard/pxa27x_keypad.c | 4 | ||||
-rw-r--r-- | drivers/input/keyboard/spitzkbd.c | 1 | ||||
-rw-r--r-- | drivers/input/keyboard/tosakbd.c | 2 |
10 files changed, 25 insertions, 0 deletions
diff --git a/drivers/input/keyboard/aaed2000_kbd.c b/drivers/input/keyboard/aaed2000_kbd.c index 72abc196ce66..a293e8b3f508 100644 --- a/drivers/input/keyboard/aaed2000_kbd.c +++ b/drivers/input/keyboard/aaed2000_kbd.c | |||
@@ -156,11 +156,15 @@ static int __devexit aaedkbd_remove(struct platform_device *pdev) | |||
156 | return 0; | 156 | return 0; |
157 | } | 157 | } |
158 | 158 | ||
159 | /* work with hotplug and coldplug */ | ||
160 | MODULE_ALIAS("platform:aaed2000-keyboard"); | ||
161 | |||
159 | static struct platform_driver aaedkbd_driver = { | 162 | static struct platform_driver aaedkbd_driver = { |
160 | .probe = aaedkbd_probe, | 163 | .probe = aaedkbd_probe, |
161 | .remove = __devexit_p(aaedkbd_remove), | 164 | .remove = __devexit_p(aaedkbd_remove), |
162 | .driver = { | 165 | .driver = { |
163 | .name = "aaed2000-keyboard", | 166 | .name = "aaed2000-keyboard", |
167 | .owner = THIS_MODULE, | ||
164 | }, | 168 | }, |
165 | }; | 169 | }; |
166 | 170 | ||
diff --git a/drivers/input/keyboard/bf54x-keys.c b/drivers/input/keyboard/bf54x-keys.c index 05e3494cf8b8..d87ac3322a6d 100644 --- a/drivers/input/keyboard/bf54x-keys.c +++ b/drivers/input/keyboard/bf54x-keys.c | |||
@@ -359,6 +359,7 @@ struct platform_driver bfin_kpad_device_driver = { | |||
359 | .remove = __devexit_p(bfin_kpad_remove), | 359 | .remove = __devexit_p(bfin_kpad_remove), |
360 | .driver = { | 360 | .driver = { |
361 | .name = DRV_NAME, | 361 | .name = DRV_NAME, |
362 | .owner = THIS_MODULE, | ||
362 | } | 363 | } |
363 | }; | 364 | }; |
364 | 365 | ||
@@ -378,3 +379,4 @@ module_exit(bfin_kpad_exit); | |||
378 | MODULE_LICENSE("GPL"); | 379 | MODULE_LICENSE("GPL"); |
379 | MODULE_AUTHOR("Michael Hennerich <hennerich@blackfin.uclinux.org>"); | 380 | MODULE_AUTHOR("Michael Hennerich <hennerich@blackfin.uclinux.org>"); |
380 | MODULE_DESCRIPTION("Keypad driver for BF54x Processors"); | 381 | MODULE_DESCRIPTION("Keypad driver for BF54x Processors"); |
382 | MODULE_ALIAS("platform:bf54x-keys"); | ||
diff --git a/drivers/input/keyboard/corgikbd.c b/drivers/input/keyboard/corgikbd.c index 790fed368aae..5187c0c7a222 100644 --- a/drivers/input/keyboard/corgikbd.c +++ b/drivers/input/keyboard/corgikbd.c | |||
@@ -392,6 +392,7 @@ static struct platform_driver corgikbd_driver = { | |||
392 | .resume = corgikbd_resume, | 392 | .resume = corgikbd_resume, |
393 | .driver = { | 393 | .driver = { |
394 | .name = "corgi-keyboard", | 394 | .name = "corgi-keyboard", |
395 | .owner = THIS_MODULE, | ||
395 | }, | 396 | }, |
396 | }; | 397 | }; |
397 | 398 | ||
@@ -411,3 +412,4 @@ module_exit(corgikbd_exit); | |||
411 | MODULE_AUTHOR("Richard Purdie <rpurdie@rpsys.net>"); | 412 | MODULE_AUTHOR("Richard Purdie <rpurdie@rpsys.net>"); |
412 | MODULE_DESCRIPTION("Corgi Keyboard Driver"); | 413 | MODULE_DESCRIPTION("Corgi Keyboard Driver"); |
413 | MODULE_LICENSE("GPLv2"); | 414 | MODULE_LICENSE("GPLv2"); |
415 | MODULE_ALIAS("platform:corgi-keyboard"); | ||
diff --git a/drivers/input/keyboard/gpio_keys.c b/drivers/input/keyboard/gpio_keys.c index a54dc15f9005..bbd00c3fe98c 100644 --- a/drivers/input/keyboard/gpio_keys.c +++ b/drivers/input/keyboard/gpio_keys.c | |||
@@ -214,6 +214,7 @@ struct platform_driver gpio_keys_device_driver = { | |||
214 | .resume = gpio_keys_resume, | 214 | .resume = gpio_keys_resume, |
215 | .driver = { | 215 | .driver = { |
216 | .name = "gpio-keys", | 216 | .name = "gpio-keys", |
217 | .owner = THIS_MODULE, | ||
217 | } | 218 | } |
218 | }; | 219 | }; |
219 | 220 | ||
@@ -233,3 +234,4 @@ module_exit(gpio_keys_exit); | |||
233 | MODULE_LICENSE("GPL"); | 234 | MODULE_LICENSE("GPL"); |
234 | MODULE_AUTHOR("Phil Blundell <pb@handhelds.org>"); | 235 | MODULE_AUTHOR("Phil Blundell <pb@handhelds.org>"); |
235 | MODULE_DESCRIPTION("Keyboard driver for CPU GPIOs"); | 236 | MODULE_DESCRIPTION("Keyboard driver for CPU GPIOs"); |
237 | MODULE_ALIAS("platform:gpio-keys"); | ||
diff --git a/drivers/input/keyboard/jornada680_kbd.c b/drivers/input/keyboard/jornada680_kbd.c index a23633a2e1b4..9387da343f97 100644 --- a/drivers/input/keyboard/jornada680_kbd.c +++ b/drivers/input/keyboard/jornada680_kbd.c | |||
@@ -254,6 +254,7 @@ static int __devexit jornada680kbd_remove(struct platform_device *pdev) | |||
254 | static struct platform_driver jornada680kbd_driver = { | 254 | static struct platform_driver jornada680kbd_driver = { |
255 | .driver = { | 255 | .driver = { |
256 | .name = "jornada680_kbd", | 256 | .name = "jornada680_kbd", |
257 | .owner = THIS_MODULE, | ||
257 | }, | 258 | }, |
258 | .probe = jornada680kbd_probe, | 259 | .probe = jornada680kbd_probe, |
259 | .remove = __devexit_p(jornada680kbd_remove), | 260 | .remove = __devexit_p(jornada680kbd_remove), |
@@ -275,3 +276,4 @@ module_exit(jornada680kbd_exit); | |||
275 | MODULE_AUTHOR("Kristoffer Ericson <kristoffer.ericson@gmail.com>"); | 276 | MODULE_AUTHOR("Kristoffer Ericson <kristoffer.ericson@gmail.com>"); |
276 | MODULE_DESCRIPTION("HP Jornada 620/660/680/690 Keyboard Driver"); | 277 | MODULE_DESCRIPTION("HP Jornada 620/660/680/690 Keyboard Driver"); |
277 | MODULE_LICENSE("GPLv2"); | 278 | MODULE_LICENSE("GPLv2"); |
279 | MODULE_ALIAS("platform:jornada680_kbd"); | ||
diff --git a/drivers/input/keyboard/jornada720_kbd.c b/drivers/input/keyboard/jornada720_kbd.c index 986f93cfc6b8..a1164a0c7736 100644 --- a/drivers/input/keyboard/jornada720_kbd.c +++ b/drivers/input/keyboard/jornada720_kbd.c | |||
@@ -162,9 +162,13 @@ static int __devexit jornada720_kbd_remove(struct platform_device *pdev) | |||
162 | return 0; | 162 | return 0; |
163 | } | 163 | } |
164 | 164 | ||
165 | /* work with hotplug and coldplug */ | ||
166 | MODULE_ALIAS("platform:jornada720_kbd"); | ||
167 | |||
165 | static struct platform_driver jornada720_kbd_driver = { | 168 | static struct platform_driver jornada720_kbd_driver = { |
166 | .driver = { | 169 | .driver = { |
167 | .name = "jornada720_kbd", | 170 | .name = "jornada720_kbd", |
171 | .owner = THIS_MODULE, | ||
168 | }, | 172 | }, |
169 | .probe = jornada720_kbd_probe, | 173 | .probe = jornada720_kbd_probe, |
170 | .remove = __devexit_p(jornada720_kbd_remove), | 174 | .remove = __devexit_p(jornada720_kbd_remove), |
diff --git a/drivers/input/keyboard/omap-keypad.c b/drivers/input/keyboard/omap-keypad.c index eec328167f8d..10afd2068068 100644 --- a/drivers/input/keyboard/omap-keypad.c +++ b/drivers/input/keyboard/omap-keypad.c | |||
@@ -467,6 +467,7 @@ static struct platform_driver omap_kp_driver = { | |||
467 | .resume = omap_kp_resume, | 467 | .resume = omap_kp_resume, |
468 | .driver = { | 468 | .driver = { |
469 | .name = "omap-keypad", | 469 | .name = "omap-keypad", |
470 | .owner = THIS_MODULE, | ||
470 | }, | 471 | }, |
471 | }; | 472 | }; |
472 | 473 | ||
@@ -487,3 +488,4 @@ module_exit(omap_kp_exit); | |||
487 | MODULE_AUTHOR("Timo Teräs"); | 488 | MODULE_AUTHOR("Timo Teräs"); |
488 | MODULE_DESCRIPTION("OMAP Keypad Driver"); | 489 | MODULE_DESCRIPTION("OMAP Keypad Driver"); |
489 | MODULE_LICENSE("GPL"); | 490 | MODULE_LICENSE("GPL"); |
491 | MODULE_ALIAS("platform:omap-keypad"); | ||
diff --git a/drivers/input/keyboard/pxa27x_keypad.c b/drivers/input/keyboard/pxa27x_keypad.c index 4e651c11c1da..3dea0c5077a9 100644 --- a/drivers/input/keyboard/pxa27x_keypad.c +++ b/drivers/input/keyboard/pxa27x_keypad.c | |||
@@ -545,6 +545,9 @@ static int __devexit pxa27x_keypad_remove(struct platform_device *pdev) | |||
545 | return 0; | 545 | return 0; |
546 | } | 546 | } |
547 | 547 | ||
548 | /* work with hotplug and coldplug */ | ||
549 | MODULE_ALIAS("platform:pxa27x-keypad"); | ||
550 | |||
548 | static struct platform_driver pxa27x_keypad_driver = { | 551 | static struct platform_driver pxa27x_keypad_driver = { |
549 | .probe = pxa27x_keypad_probe, | 552 | .probe = pxa27x_keypad_probe, |
550 | .remove = __devexit_p(pxa27x_keypad_remove), | 553 | .remove = __devexit_p(pxa27x_keypad_remove), |
@@ -552,6 +555,7 @@ static struct platform_driver pxa27x_keypad_driver = { | |||
552 | .resume = pxa27x_keypad_resume, | 555 | .resume = pxa27x_keypad_resume, |
553 | .driver = { | 556 | .driver = { |
554 | .name = "pxa27x-keypad", | 557 | .name = "pxa27x-keypad", |
558 | .owner = THIS_MODULE, | ||
555 | }, | 559 | }, |
556 | }; | 560 | }; |
557 | 561 | ||
diff --git a/drivers/input/keyboard/spitzkbd.c b/drivers/input/keyboard/spitzkbd.c index 1d59a2dc3c17..92102f9e4b8b 100644 --- a/drivers/input/keyboard/spitzkbd.c +++ b/drivers/input/keyboard/spitzkbd.c | |||
@@ -494,3 +494,4 @@ module_exit(spitzkbd_exit); | |||
494 | MODULE_AUTHOR("Richard Purdie <rpurdie@rpsys.net>"); | 494 | MODULE_AUTHOR("Richard Purdie <rpurdie@rpsys.net>"); |
495 | MODULE_DESCRIPTION("Spitz Keyboard Driver"); | 495 | MODULE_DESCRIPTION("Spitz Keyboard Driver"); |
496 | MODULE_LICENSE("GPLv2"); | 496 | MODULE_LICENSE("GPLv2"); |
497 | MODULE_ALIAS("platform:spitz-keyboard"); | ||
diff --git a/drivers/input/keyboard/tosakbd.c b/drivers/input/keyboard/tosakbd.c index a247006757de..94e444b4ee15 100644 --- a/drivers/input/keyboard/tosakbd.c +++ b/drivers/input/keyboard/tosakbd.c | |||
@@ -409,6 +409,7 @@ static struct platform_driver tosakbd_driver = { | |||
409 | .resume = tosakbd_resume, | 409 | .resume = tosakbd_resume, |
410 | .driver = { | 410 | .driver = { |
411 | .name = "tosa-keyboard", | 411 | .name = "tosa-keyboard", |
412 | .owner = THIS_MODULE, | ||
412 | }, | 413 | }, |
413 | }; | 414 | }; |
414 | 415 | ||
@@ -428,3 +429,4 @@ module_exit(tosakbd_exit); | |||
428 | MODULE_AUTHOR("Dirk Opfer <Dirk@Opfer-Online.de>"); | 429 | MODULE_AUTHOR("Dirk Opfer <Dirk@Opfer-Online.de>"); |
429 | MODULE_DESCRIPTION("Tosa Keyboard Driver"); | 430 | MODULE_DESCRIPTION("Tosa Keyboard Driver"); |
430 | MODULE_LICENSE("GPL v2"); | 431 | MODULE_LICENSE("GPL v2"); |
432 | MODULE_ALIAS("platform:tosa-keyboard"); | ||