From: Kay Sievers <dmitry.torokhov@gmail.com>
To: unlisted-recipients:; (no To-header on input)
Cc: linux-kernel@vger.kernel.org, jkosina@suse.cz, akpm@linux-foundation.org
Subject: [PATCH 34/37] Input: add MODULE_ALIAS() to hotpluggable platform modules
Date: Fri, 18 Apr 2008 00:24:42 -0400 [thread overview]
Message-ID: <7f5974f26d90fc2dc57b8bab18cf60732e3c0b3d.1208783694.git.dmitry.torokhov@gmail.com> (raw)
In-Reply-To: <cover.1208783694.git.dmitry.torokhov@gmail.com>
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain, Size: 10290 bytes --]
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>
---
drivers/input/keyboard/aaed2000_kbd.c | 4 ++++
drivers/input/keyboard/bf54x-keys.c | 2 ++
drivers/input/keyboard/corgikbd.c | 2 ++
drivers/input/keyboard/gpio_keys.c | 2 ++
drivers/input/keyboard/jornada680_kbd.c | 2 ++
drivers/input/keyboard/jornada720_kbd.c | 4 ++++
drivers/input/keyboard/omap-keypad.c | 2 ++
drivers/input/keyboard/pxa27x_keypad.c | 4 ++++
drivers/input/keyboard/spitzkbd.c | 1 +
drivers/input/keyboard/tosakbd.c | 2 ++
drivers/input/misc/cobalt_btns.c | 3 +++
drivers/input/mouse/gpio_mouse.c | 4 ++++
drivers/input/serio/rpckbd.c | 2 ++
drivers/input/touchscreen/corgi_ts.c | 2 ++
drivers/input/touchscreen/jornada720_ts.c | 4 ++++
15 files changed, 40 insertions(+), 0 deletions(-)
diff --git a/drivers/input/keyboard/aaed2000_kbd.c b/drivers/input/keyboard/aaed2000_kbd.c
index 72abc19..a293e8b 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)
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,
},
};
diff --git a/drivers/input/keyboard/bf54x-keys.c b/drivers/input/keyboard/bf54x-keys.c
index 05e3494..d87ac33 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 = {
.remove = __devexit_p(bfin_kpad_remove),
.driver = {
.name = DRV_NAME,
+ .owner = THIS_MODULE,
}
};
@@ -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");
diff --git a/drivers/input/keyboard/corgikbd.c b/drivers/input/keyboard/corgikbd.c
index 790fed3..5187c0c 100644
--- a/drivers/input/keyboard/corgikbd.c
+++ b/drivers/input/keyboard/corgikbd.c
@@ -392,6 +392,7 @@ static struct platform_driver corgikbd_driver = {
.resume = corgikbd_resume,
.driver = {
.name = "corgi-keyboard",
+ .owner = THIS_MODULE,
},
};
@@ -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");
diff --git a/drivers/input/keyboard/gpio_keys.c b/drivers/input/keyboard/gpio_keys.c
index a54dc15..bbd00c3 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 = {
.resume = gpio_keys_resume,
.driver = {
.name = "gpio-keys",
+ .owner = THIS_MODULE,
}
};
@@ -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");
diff --git a/drivers/input/keyboard/jornada680_kbd.c b/drivers/input/keyboard/jornada680_kbd.c
index a23633a..9387da3 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)
static struct platform_driver jornada680kbd_driver = {
.driver = {
.name = "jornada680_kbd",
+ .owner = THIS_MODULE,
},
.probe = jornada680kbd_probe,
.remove = __devexit_p(jornada680kbd_remove),
@@ -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");
diff --git a/drivers/input/keyboard/jornada720_kbd.c b/drivers/input/keyboard/jornada720_kbd.c
index 986f93c..a1164a0 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)
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),
diff --git a/drivers/input/keyboard/omap-keypad.c b/drivers/input/keyboard/omap-keypad.c
index eec3281..10afd20 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 = {
.resume = omap_kp_resume,
.driver = {
.name = "omap-keypad",
+ .owner = THIS_MODULE,
},
};
@@ -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");
diff --git a/drivers/input/keyboard/pxa27x_keypad.c b/drivers/input/keyboard/pxa27x_keypad.c
index 4e651c1..3dea0c5 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)
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),
@@ -552,6 +555,7 @@ static struct platform_driver pxa27x_keypad_driver = {
.resume = pxa27x_keypad_resume,
.driver = {
.name = "pxa27x-keypad",
+ .owner = THIS_MODULE,
},
};
diff --git a/drivers/input/keyboard/spitzkbd.c b/drivers/input/keyboard/spitzkbd.c
index 1d59a2d..92102f9 100644
--- a/drivers/input/keyboard/spitzkbd.c
+++ b/drivers/input/keyboard/spitzkbd.c
@@ -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");
diff --git a/drivers/input/keyboard/tosakbd.c b/drivers/input/keyboard/tosakbd.c
index a247006..94e444b 100644
--- a/drivers/input/keyboard/tosakbd.c
+++ b/drivers/input/keyboard/tosakbd.c
@@ -409,6 +409,7 @@ static struct platform_driver tosakbd_driver = {
.resume = tosakbd_resume,
.driver = {
.name = "tosa-keyboard",
+ .owner = THIS_MODULE,
},
};
@@ -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");
diff --git a/drivers/input/misc/cobalt_btns.c b/drivers/input/misc/cobalt_btns.c
index 5511ef0..6a1f48b 100644
--- a/drivers/input/misc/cobalt_btns.c
+++ b/drivers/input/misc/cobalt_btns.c
@@ -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),
diff --git a/drivers/input/mouse/gpio_mouse.c b/drivers/input/mouse/gpio_mouse.c
index 0936d6b..3392901 100644
--- a/drivers/input/mouse/gpio_mouse.c
+++ b/drivers/input/mouse/gpio_mouse.c
@@ -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,
}
};
diff --git a/drivers/input/serio/rpckbd.c b/drivers/input/serio/rpckbd.c
index 49f8431..34c59d9 100644
--- a/drivers/input/serio/rpckbd.c
+++ b/drivers/input/serio/rpckbd.c
@@ -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)
{
@@ -140,6 +141,7 @@ static struct platform_driver rpckbd_driver = {
.remove = __devexit_p(rpckbd_remove),
.driver = {
.name = "kart",
+ .owner = THIS_MODULE,
},
};
diff --git a/drivers/input/touchscreen/corgi_ts.c b/drivers/input/touchscreen/corgi_ts.c
index 99d92f5..765e964 100644
--- a/drivers/input/touchscreen/corgi_ts.c
+++ b/drivers/input/touchscreen/corgi_ts.c
@@ -361,6 +361,7 @@ static struct platform_driver corgits_driver = {
.resume = corgits_resume,
.driver = {
.name = "corgi-ts",
+ .owner = THIS_MODULE,
},
};
@@ -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");
diff --git a/drivers/input/touchscreen/jornada720_ts.c b/drivers/input/touchscreen/jornada720_ts.c
index 42a1c9a..7422421 100644
--- a/drivers/input/touchscreen/jornada720_ts.c
+++ b/drivers/input/touchscreen/jornada720_ts.c
@@ -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,
},
};
--
1.5.5.rc2.6.gf58d
next prev parent reply other threads:[~2008-04-21 13:26 UTC|newest]
Thread overview: 50+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-04-21 13:14 [PATCH 00/37] Input queue for 2.6.26 merge window Dmitry Torokhov
2008-03-10 10:08 ` [PATCH 27/37] Input: aiptek - add support for Genius G-PEN 560 tablet Guryanov Dmitry
2008-03-10 12:40 ` [PATCH 28/37] Input: add Zhen Hua driver Martin Kebert
2008-03-10 12:43 ` [PATCH 29/37] Input: fix ordering in joystick Makefile Jiri Kosina
2008-04-21 13:40 ` Jiri Kosina
2008-04-21 16:20 ` Dmitry Torokhov
2008-04-21 14:22 ` Adrian Bunk
2008-04-21 15:39 ` Dmitry Torokhov
2008-04-21 15:54 ` Adrian Bunk
2008-04-02 4:41 ` [PATCH 01/37] Input: remove private member from input_dev structure Dmitry Torokhov
2008-04-02 4:42 ` [PATCH 02/37] Input: locomokbd - add 'off' button support for Sharp Collie/Poodle Helge Deller
2008-04-02 4:43 ` [PATCH 03/37] Input: ads7846 - simplify support of external vREF (and ads7843) David Brownell
2008-04-02 4:51 ` [PATCH 04/37] Input: add support for WM97xx familty touchscreens Mark Brown
2008-04-02 4:51 ` [PATCH 05/37] Input: WM97xx - add chip driver for WM9705 touchscreen Mark Brown
2008-04-02 4:51 ` [PATCH 06/37] Input: WM97xx - add chip driver for WM9712 touchscreen Mark Brown
2008-04-02 4:51 ` [PATCH 07/37] Input: WM97xx - add chip driver for WM97123 touchscreen Mark Brown
2008-04-02 4:51 ` [PATCH 08/37] Input: WM97xx - add support for streaming mode on Mainstone Mark Brown
2008-04-02 14:02 ` [PATCH 09/37] Input: appletouch - add product IDs for the 4th generation MacBooks Tobias Mueller
2008-04-02 15:22 ` [PATCH 10/37] Input: tosakbd - fix suspend Dmitry Baryshkov
2008-04-03 20:17 ` [PATCH 11/37] Input: xpad - match xbox 360 devices with interface info Anssi Hannula
2008-04-03 20:18 ` [PATCH 12/37] Input: xpad - fix dpad handling of unknown devices Anssi Hannula
2008-04-03 20:18 ` [PATCH 13/37] Input: xpad - fix inverted Y and RY axes Anssi Hannula
2008-04-03 20:18 ` [PATCH 14/37] Input: xpad - add more xbox 360 controller ids Anssi Hannula
2008-04-03 20:18 ` [PATCH 15/37] Input: xpad - do not report nonexistent buttons for xbox360 Anssi Hannula
2008-04-03 20:18 ` [PATCH 16/37] Input: xpad - enable force feedback on xbox 360 controllers only Anssi Hannula
2008-04-03 20:19 ` [PATCH 17/37] Input: xpad - drop obsolete driver versioning Anssi Hannula
2008-04-03 20:19 ` [PATCH 18/37] Input: xpad - add support for wireless xbox360 controllers Brian Magnuson
2008-04-03 20:19 ` [PATCH 19/37] Input: xpad - don't use GFP_ATOMIC Oliver Neukum
2008-04-04 19:31 ` [PATCH 20/37] Input: usbtouchscreen - don't use DMA on stack Oliver Neukum
2008-04-15 5:30 ` [PATCH 21/37] Input: put ledstate in the keyboard notifier Karl Dahlke
2008-04-15 5:30 ` [PATCH 22/37] Input: add PS/2 serio driver for AVR32 devices Hans-Christian Egtvedt
2008-04-21 13:33 ` Hans-Christian Egtvedt
2008-04-21 15:39 ` Dmitry Torokhov
2008-04-15 5:31 ` [PATCH 23/37] Input: gpio_keys - irq handling cleanup David Brownell
2008-04-15 5:31 ` [PATCH 24/37] Input: omap-keypad - fix build warning David Brownell
2008-04-15 5:31 ` [PATCH 25/37] Input: xpad - set proper buffer length for outgoing requests Michael Gruber
2008-04-15 5:31 ` [PATCH 26/37] Input: wacom - implement suspend and autosuspend Oliver Neukum
2008-04-17 13:24 ` [PATCH 30/37] Input: wm97xx-core - only schedule interrupt handler if not already scheduled Mark Brown
2008-04-17 13:24 ` [PATCH 31/37] Input: wm97xx-core - use IRQF_SAMPLE_RANDOM Mark Brown
2008-04-17 13:24 ` [PATCH 32/37] Input: wm97xx-core - support use as a wakeup source Mark Brown
2008-04-17 13:28 ` [PATCH 33/37] Input: drivers/char/keyboard.c - use time_after Julia Lawall
2008-04-18 4:24 ` Kay Sievers [this message]
2008-04-18 4:25 ` [PATCH 35/37] Input: bf54x-keys - add infrastructure for keypad wakeups Michael Hennerich
2008-04-18 4:25 ` [PATCH 36/37] Input: i8042 - fix incorrect usage of strncpy and strncat Roel Kluin
2008-04-18 4:25 ` [PATCH 37/37] Input: mac_hid - add lockdep annotation to emumousebtn Peter Zijlstra
2008-04-21 15:11 ` [PATCH 00/37] Input queue for 2.6.26 merge window Henrique de Moraes Holschuh
2008-04-21 15:44 ` Dmitry Torokhov
2008-04-21 16:58 ` Henrique de Moraes Holschuh
2008-04-26 13:24 ` [build bug] " Ingo Molnar
2008-04-27 4:07 ` Dmitry Torokhov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=7f5974f26d90fc2dc57b8bab18cf60732e3c0b3d.1208783694.git.dmitry.torokhov@gmail.com \
--to=dmitry.torokhov@gmail.com \
--cc=akpm@linux-foundation.org \
--cc=jkosina@suse.cz \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®