Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Kay Sievers and committed by
Dmitry Torokhov
d7b5247b b39b0440

+40
+4
drivers/input/keyboard/aaed2000_kbd.c
··· 156 156 return 0; 157 157 } 158 158 159 + /* work with hotplug and coldplug */ 160 + MODULE_ALIAS("platform:aaed2000-keyboard"); 161 + 159 162 static struct platform_driver aaedkbd_driver = { 160 163 .probe = aaedkbd_probe, 161 164 .remove = __devexit_p(aaedkbd_remove), 162 165 .driver = { 163 166 .name = "aaed2000-keyboard", 167 + .owner = THIS_MODULE, 164 168 }, 165 169 }; 166 170
+2
drivers/input/keyboard/bf54x-keys.c
··· 359 359 .remove = __devexit_p(bfin_kpad_remove), 360 360 .driver = { 361 361 .name = DRV_NAME, 362 + .owner = THIS_MODULE, 362 363 } 363 364 }; 364 365 ··· 379 378 MODULE_LICENSE("GPL"); 380 379 MODULE_AUTHOR("Michael Hennerich <hennerich@blackfin.uclinux.org>"); 381 380 MODULE_DESCRIPTION("Keypad driver for BF54x Processors"); 381 + MODULE_ALIAS("platform:bf54x-keys");
+2
drivers/input/keyboard/corgikbd.c
··· 392 392 .resume = corgikbd_resume, 393 393 .driver = { 394 394 .name = "corgi-keyboard", 395 + .owner = THIS_MODULE, 395 396 }, 396 397 }; 397 398 ··· 412 411 MODULE_AUTHOR("Richard Purdie <rpurdie@rpsys.net>"); 413 412 MODULE_DESCRIPTION("Corgi Keyboard Driver"); 414 413 MODULE_LICENSE("GPLv2"); 414 + MODULE_ALIAS("platform:corgi-keyboard");
+2
drivers/input/keyboard/gpio_keys.c
··· 214 214 .resume = gpio_keys_resume, 215 215 .driver = { 216 216 .name = "gpio-keys", 217 + .owner = THIS_MODULE, 217 218 } 218 219 }; 219 220 ··· 234 233 MODULE_LICENSE("GPL"); 235 234 MODULE_AUTHOR("Phil Blundell <pb@handhelds.org>"); 236 235 MODULE_DESCRIPTION("Keyboard driver for CPU GPIOs"); 236 + MODULE_ALIAS("platform:gpio-keys");
+2
drivers/input/keyboard/jornada680_kbd.c
··· 254 254 static struct platform_driver jornada680kbd_driver = { 255 255 .driver = { 256 256 .name = "jornada680_kbd", 257 + .owner = THIS_MODULE, 257 258 }, 258 259 .probe = jornada680kbd_probe, 259 260 .remove = __devexit_p(jornada680kbd_remove), ··· 276 275 MODULE_AUTHOR("Kristoffer Ericson <kristoffer.ericson@gmail.com>"); 277 276 MODULE_DESCRIPTION("HP Jornada 620/660/680/690 Keyboard Driver"); 278 277 MODULE_LICENSE("GPLv2"); 278 + MODULE_ALIAS("platform:jornada680_kbd");
+4
drivers/input/keyboard/jornada720_kbd.c
··· 162 162 return 0; 163 163 } 164 164 165 + /* work with hotplug and coldplug */ 166 + MODULE_ALIAS("platform:jornada720_kbd"); 167 + 165 168 static struct platform_driver jornada720_kbd_driver = { 166 169 .driver = { 167 170 .name = "jornada720_kbd", 171 + .owner = THIS_MODULE, 168 172 }, 169 173 .probe = jornada720_kbd_probe, 170 174 .remove = __devexit_p(jornada720_kbd_remove),
+2
drivers/input/keyboard/omap-keypad.c
··· 467 467 .resume = omap_kp_resume, 468 468 .driver = { 469 469 .name = "omap-keypad", 470 + .owner = THIS_MODULE, 470 471 }, 471 472 }; 472 473 ··· 488 487 MODULE_AUTHOR("Timo Teräs"); 489 488 MODULE_DESCRIPTION("OMAP Keypad Driver"); 490 489 MODULE_LICENSE("GPL"); 490 + MODULE_ALIAS("platform:omap-keypad");
+4
drivers/input/keyboard/pxa27x_keypad.c
··· 545 545 return 0; 546 546 } 547 547 548 + /* work with hotplug and coldplug */ 549 + MODULE_ALIAS("platform:pxa27x-keypad"); 550 + 548 551 static struct platform_driver pxa27x_keypad_driver = { 549 552 .probe = pxa27x_keypad_probe, 550 553 .remove = __devexit_p(pxa27x_keypad_remove), ··· 555 552 .resume = pxa27x_keypad_resume, 556 553 .driver = { 557 554 .name = "pxa27x-keypad", 555 + .owner = THIS_MODULE, 558 556 }, 559 557 }; 560 558
+1
drivers/input/keyboard/spitzkbd.c
··· 494 494 MODULE_AUTHOR("Richard Purdie <rpurdie@rpsys.net>"); 495 495 MODULE_DESCRIPTION("Spitz Keyboard Driver"); 496 496 MODULE_LICENSE("GPLv2"); 497 + MODULE_ALIAS("platform:spitz-keyboard");
+2
drivers/input/keyboard/tosakbd.c
··· 409 409 .resume = tosakbd_resume, 410 410 .driver = { 411 411 .name = "tosa-keyboard", 412 + .owner = THIS_MODULE, 412 413 }, 413 414 }; 414 415 ··· 429 428 MODULE_AUTHOR("Dirk Opfer <Dirk@Opfer-Online.de>"); 430 429 MODULE_DESCRIPTION("Tosa Keyboard Driver"); 431 430 MODULE_LICENSE("GPL v2"); 431 + MODULE_ALIAS("platform:tosa-keyboard");
+3
drivers/input/misc/cobalt_btns.c
··· 148 148 return 0; 149 149 } 150 150 151 + /* work with hotplug and coldplug */ 152 + MODULE_ALIAS("platform:Cobalt buttons"); 153 + 151 154 static struct platform_driver cobalt_buttons_driver = { 152 155 .probe = cobalt_buttons_probe, 153 156 .remove = __devexit_p(cobalt_buttons_remove),
+4
drivers/input/mouse/gpio_mouse.c
··· 171 171 return 0; 172 172 } 173 173 174 + /* work with hotplug and coldplug */ 175 + MODULE_ALIAS("platform:gpio_mouse"); 176 + 174 177 struct platform_driver gpio_mouse_device_driver = { 175 178 .remove = __devexit_p(gpio_mouse_remove), 176 179 .driver = { 177 180 .name = "gpio_mouse", 181 + .owner = THIS_MODULE, 178 182 } 179 183 }; 180 184
+2
drivers/input/serio/rpckbd.c
··· 45 45 MODULE_AUTHOR("Vojtech Pavlik, Russell King"); 46 46 MODULE_DESCRIPTION("Acorn RiscPC PS/2 keyboard controller driver"); 47 47 MODULE_LICENSE("GPL"); 48 + MODULE_ALIAS("platform:kart"); 48 49 49 50 static int rpckbd_write(struct serio *port, unsigned char val) 50 51 { ··· 141 140 .remove = __devexit_p(rpckbd_remove), 142 141 .driver = { 143 142 .name = "kart", 143 + .owner = THIS_MODULE, 144 144 }, 145 145 }; 146 146
+2
drivers/input/touchscreen/corgi_ts.c
··· 361 361 .resume = corgits_resume, 362 362 .driver = { 363 363 .name = "corgi-ts", 364 + .owner = THIS_MODULE, 364 365 }, 365 366 }; 366 367 ··· 381 380 MODULE_AUTHOR("Richard Purdie <rpurdie@rpsys.net>"); 382 381 MODULE_DESCRIPTION("Corgi TouchScreen Driver"); 383 382 MODULE_LICENSE("GPL"); 383 + MODULE_ALIAS("platform:corgi-ts");
+4
drivers/input/touchscreen/jornada720_ts.c
··· 160 160 return 0; 161 161 } 162 162 163 + /* work with hotplug and coldplug */ 164 + MODULE_ALIAS("platform:jornada_ts"); 165 + 163 166 static struct platform_driver jornada720_ts_driver = { 164 167 .probe = jornada720_ts_probe, 165 168 .remove = __devexit_p(jornada720_ts_remove), 166 169 .driver = { 167 170 .name = "jornada_ts", 171 + .owner = THIS_MODULE, 168 172 }, 169 173 }; 170 174