Skip to content

Commit

Permalink
Input: add MODULE_ALIAS() to hotpluggable platform modules
Browse files Browse the repository at this point in the history
Since 43cc71e, 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>
  • Loading branch information
Kay Sievers authored and Dmitry Torokhov committed Apr 24, 2008
1 parent b39b044 commit d7b5247
Show file tree
Hide file tree
Showing 15 changed files with 40 additions and 0 deletions.
4 changes: 4 additions & 0 deletions drivers/input/keyboard/aaed2000_kbd.c
Original file line number Diff line number Diff line change
Expand Up @@ -156,11 +156,15 @@ static int __devexit aaedkbd_remove(struct platform_device *pdev)
return 0;
}

/* work with hotplug and coldplug */
MODULE_ALIAS("platform:aaed2000-keyboard");

static struct platform_driver aaedkbd_driver = {
.probe = aaedkbd_probe,
.remove = __devexit_p(aaedkbd_remove),
.driver = {
.name = "aaed2000-keyboard",
.owner = THIS_MODULE,
},
};

Expand Down
2 changes: 2 additions & 0 deletions drivers/input/keyboard/bf54x-keys.c
Original file line number Diff line number Diff line change
Expand Up @@ -359,6 +359,7 @@ struct platform_driver bfin_kpad_device_driver = {
.remove = __devexit_p(bfin_kpad_remove),
.driver = {
.name = DRV_NAME,
.owner = THIS_MODULE,
}
};

Expand All @@ -378,3 +379,4 @@ module_exit(bfin_kpad_exit);
MODULE_LICENSE("GPL");
MODULE_AUTHOR("Michael Hennerich <hennerich@blackfin.uclinux.org>");
MODULE_DESCRIPTION("Keypad driver for BF54x Processors");
MODULE_ALIAS("platform:bf54x-keys");
2 changes: 2 additions & 0 deletions drivers/input/keyboard/corgikbd.c
Original file line number Diff line number Diff line change
Expand Up @@ -392,6 +392,7 @@ static struct platform_driver corgikbd_driver = {
.resume = corgikbd_resume,
.driver = {
.name = "corgi-keyboard",
.owner = THIS_MODULE,
},
};

Expand All @@ -411,3 +412,4 @@ module_exit(corgikbd_exit);
MODULE_AUTHOR("Richard Purdie <rpurdie@rpsys.net>");
MODULE_DESCRIPTION("Corgi Keyboard Driver");
MODULE_LICENSE("GPLv2");
MODULE_ALIAS("platform:corgi-keyboard");
2 changes: 2 additions & 0 deletions drivers/input/keyboard/gpio_keys.c
Original file line number Diff line number Diff line change
Expand Up @@ -214,6 +214,7 @@ struct platform_driver gpio_keys_device_driver = {
.resume = gpio_keys_resume,
.driver = {
.name = "gpio-keys",
.owner = THIS_MODULE,
}
};

Expand All @@ -233,3 +234,4 @@ module_exit(gpio_keys_exit);
MODULE_LICENSE("GPL");
MODULE_AUTHOR("Phil Blundell <pb@handhelds.org>");
MODULE_DESCRIPTION("Keyboard driver for CPU GPIOs");
MODULE_ALIAS("platform:gpio-keys");
2 changes: 2 additions & 0 deletions drivers/input/keyboard/jornada680_kbd.c
Original file line number Diff line number Diff line change
Expand Up @@ -254,6 +254,7 @@ static int __devexit jornada680kbd_remove(struct platform_device *pdev)
static struct platform_driver jornada680kbd_driver = {
.driver = {
.name = "jornada680_kbd",
.owner = THIS_MODULE,
},
.probe = jornada680kbd_probe,
.remove = __devexit_p(jornada680kbd_remove),
Expand All @@ -275,3 +276,4 @@ module_exit(jornada680kbd_exit);
MODULE_AUTHOR("Kristoffer Ericson <kristoffer.ericson@gmail.com>");
MODULE_DESCRIPTION("HP Jornada 620/660/680/690 Keyboard Driver");
MODULE_LICENSE("GPLv2");
MODULE_ALIAS("platform:jornada680_kbd");
4 changes: 4 additions & 0 deletions drivers/input/keyboard/jornada720_kbd.c
Original file line number Diff line number Diff line change
Expand Up @@ -162,9 +162,13 @@ static int __devexit jornada720_kbd_remove(struct platform_device *pdev)
return 0;
}

/* work with hotplug and coldplug */
MODULE_ALIAS("platform:jornada720_kbd");

static struct platform_driver jornada720_kbd_driver = {
.driver = {
.name = "jornada720_kbd",
.owner = THIS_MODULE,
},
.probe = jornada720_kbd_probe,
.remove = __devexit_p(jornada720_kbd_remove),
Expand Down
2 changes: 2 additions & 0 deletions drivers/input/keyboard/omap-keypad.c
Original file line number Diff line number Diff line change
Expand Up @@ -467,6 +467,7 @@ static struct platform_driver omap_kp_driver = {
.resume = omap_kp_resume,
.driver = {
.name = "omap-keypad",
.owner = THIS_MODULE,
},
};

Expand All @@ -487,3 +488,4 @@ module_exit(omap_kp_exit);
MODULE_AUTHOR("Timo Teräs");
MODULE_DESCRIPTION("OMAP Keypad Driver");
MODULE_LICENSE("GPL");
MODULE_ALIAS("platform:omap-keypad");
4 changes: 4 additions & 0 deletions drivers/input/keyboard/pxa27x_keypad.c
Original file line number Diff line number Diff line change
Expand Up @@ -545,13 +545,17 @@ static int __devexit pxa27x_keypad_remove(struct platform_device *pdev)
return 0;
}

/* work with hotplug and coldplug */
MODULE_ALIAS("platform:pxa27x-keypad");

static struct platform_driver pxa27x_keypad_driver = {
.probe = pxa27x_keypad_probe,
.remove = __devexit_p(pxa27x_keypad_remove),
.suspend = pxa27x_keypad_suspend,
.resume = pxa27x_keypad_resume,
.driver = {
.name = "pxa27x-keypad",
.owner = THIS_MODULE,
},
};

Expand Down
1 change: 1 addition & 0 deletions drivers/input/keyboard/spitzkbd.c
Original file line number Diff line number Diff line change
Expand Up @@ -494,3 +494,4 @@ module_exit(spitzkbd_exit);
MODULE_AUTHOR("Richard Purdie <rpurdie@rpsys.net>");
MODULE_DESCRIPTION("Spitz Keyboard Driver");
MODULE_LICENSE("GPLv2");
MODULE_ALIAS("platform:spitz-keyboard");
2 changes: 2 additions & 0 deletions drivers/input/keyboard/tosakbd.c
Original file line number Diff line number Diff line change
Expand Up @@ -409,6 +409,7 @@ static struct platform_driver tosakbd_driver = {
.resume = tosakbd_resume,
.driver = {
.name = "tosa-keyboard",
.owner = THIS_MODULE,
},
};

Expand All @@ -428,3 +429,4 @@ module_exit(tosakbd_exit);
MODULE_AUTHOR("Dirk Opfer <Dirk@Opfer-Online.de>");
MODULE_DESCRIPTION("Tosa Keyboard Driver");
MODULE_LICENSE("GPL v2");
MODULE_ALIAS("platform:tosa-keyboard");
3 changes: 3 additions & 0 deletions drivers/input/misc/cobalt_btns.c
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,9 @@ static int __devexit cobalt_buttons_remove(struct platform_device *pdev)
return 0;
}

/* work with hotplug and coldplug */
MODULE_ALIAS("platform:Cobalt buttons");

static struct platform_driver cobalt_buttons_driver = {
.probe = cobalt_buttons_probe,
.remove = __devexit_p(cobalt_buttons_remove),
Expand Down
4 changes: 4 additions & 0 deletions drivers/input/mouse/gpio_mouse.c
Original file line number Diff line number Diff line change
Expand Up @@ -171,10 +171,14 @@ static int __devexit gpio_mouse_remove(struct platform_device *pdev)
return 0;
}

/* work with hotplug and coldplug */
MODULE_ALIAS("platform:gpio_mouse");

struct platform_driver gpio_mouse_device_driver = {
.remove = __devexit_p(gpio_mouse_remove),
.driver = {
.name = "gpio_mouse",
.owner = THIS_MODULE,
}
};

Expand Down
2 changes: 2 additions & 0 deletions drivers/input/serio/rpckbd.c
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@
MODULE_AUTHOR("Vojtech Pavlik, Russell King");
MODULE_DESCRIPTION("Acorn RiscPC PS/2 keyboard controller driver");
MODULE_LICENSE("GPL");
MODULE_ALIAS("platform:kart");

static int rpckbd_write(struct serio *port, unsigned char val)
{
Expand Down Expand Up @@ -140,6 +141,7 @@ static struct platform_driver rpckbd_driver = {
.remove = __devexit_p(rpckbd_remove),
.driver = {
.name = "kart",
.owner = THIS_MODULE,
},
};

Expand Down
2 changes: 2 additions & 0 deletions drivers/input/touchscreen/corgi_ts.c
Original file line number Diff line number Diff line change
Expand Up @@ -361,6 +361,7 @@ static struct platform_driver corgits_driver = {
.resume = corgits_resume,
.driver = {
.name = "corgi-ts",
.owner = THIS_MODULE,
},
};

Expand All @@ -380,3 +381,4 @@ module_exit(corgits_exit);
MODULE_AUTHOR("Richard Purdie <rpurdie@rpsys.net>");
MODULE_DESCRIPTION("Corgi TouchScreen Driver");
MODULE_LICENSE("GPL");
MODULE_ALIAS("platform:corgi-ts");
4 changes: 4 additions & 0 deletions drivers/input/touchscreen/jornada720_ts.c
Original file line number Diff line number Diff line change
Expand Up @@ -160,11 +160,15 @@ static int __devexit jornada720_ts_remove(struct platform_device *pdev)
return 0;
}

/* work with hotplug and coldplug */
MODULE_ALIAS("platform:jornada_ts");

static struct platform_driver jornada720_ts_driver = {
.probe = jornada720_ts_probe,
.remove = __devexit_p(jornada720_ts_remove),
.driver = {
.name = "jornada_ts",
.owner = THIS_MODULE,
},
};

Expand Down

0 comments on commit d7b5247

Please sign in to comment.