aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/serio.h
diff options
context:
space:
mode:
authorDmitry Torokhov <dtor@insightbb.com>2006-11-23 23:34:49 -0500
committerDmitry Torokhov <dtor@insightbb.com>2006-11-23 23:34:49 -0500
commited7b1f6d6ea1054ea4fe293a7fd8015fc3803d93 (patch)
treeeb4d4f4e0eb07e7ae923f654ea09297b437409cc /include/linux/serio.h
parentInput: serio - remove serio_unregister_port_delayed() (diff)
downloadlinux-dev-ed7b1f6d6ea1054ea4fe293a7fd8015fc3803d93.tar.xz
linux-dev-ed7b1f6d6ea1054ea4fe293a7fd8015fc3803d93.zip
Input: serio - make serio_register_driver() return errors
Perform actual driver registration right in serio_register_driver() instead of offloading it to kseriod and return proper error code to callers if driver registration fails. Note that driver <-> port matching is still done by kseriod to speed up boot process since probing for PS/2 mice and keyboards is pretty slow. Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Diffstat (limited to 'include/linux/serio.h')
-rw-r--r--include/linux/serio.h7
1 files changed, 1 insertions, 6 deletions
diff --git a/include/linux/serio.h b/include/linux/serio.h
index 8f52228390ab..0f478a8791a2 100644
--- a/include/linux/serio.h
+++ b/include/linux/serio.h
@@ -86,12 +86,7 @@ static inline void serio_register_port(struct serio *serio)
void serio_unregister_port(struct serio *serio);
void serio_unregister_child_port(struct serio *serio);
-void __serio_register_driver(struct serio_driver *drv, struct module *owner);
-static inline void serio_register_driver(struct serio_driver *drv)
-{
- __serio_register_driver(drv, THIS_MODULE);
-}
-
+int serio_register_driver(struct serio_driver *drv);
void serio_unregister_driver(struct serio_driver *drv);
static inline int serio_write(struct serio *serio, unsigned char data)