diff options
author | Dmitry Torokhov <dtor@insightbb.com> | 2006-11-17 01:07:39 -0500 |
---|---|---|
committer | Dmitry Torokhov <dtor@insightbb.com> | 2006-11-17 01:07:39 -0500 |
commit | 9d92fe17b652f5496c97bc83fdfe925f3182f602 (patch) | |
tree | d4b4e014922294794b6f1c3efb61ef4f814cdcc8 | |
parent | f40219bf936bb677566f42758d505e27fad0908e (diff) |
Input: serio - remove serio_unregister_port_delayed()
Now that i8042 reserves IRQs early there are no more users of this
function and it should be removed.
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
-rw-r--r-- | drivers/input/serio/serio.c | 18 | ||||
-rw-r--r-- | include/linux/serio.h | 5 |
2 files changed, 0 insertions, 23 deletions
diff --git a/drivers/input/serio/serio.c b/drivers/input/serio/serio.c index 3cb99d454e..cd55ddb7df 100644 --- a/drivers/input/serio/serio.c +++ b/drivers/input/serio/serio.c | |||
@@ -44,7 +44,6 @@ EXPORT_SYMBOL(serio_interrupt); | |||
44 | EXPORT_SYMBOL(__serio_register_port); | 44 | EXPORT_SYMBOL(__serio_register_port); |
45 | EXPORT_SYMBOL(serio_unregister_port); | 45 | EXPORT_SYMBOL(serio_unregister_port); |
46 | EXPORT_SYMBOL(serio_unregister_child_port); | 46 | EXPORT_SYMBOL(serio_unregister_child_port); |
47 | EXPORT_SYMBOL(__serio_unregister_port_delayed); | ||
48 | EXPORT_SYMBOL(__serio_register_driver); | 47 | EXPORT_SYMBOL(__serio_register_driver); |
49 | EXPORT_SYMBOL(serio_unregister_driver); | 48 | EXPORT_SYMBOL(serio_unregister_driver); |
50 | EXPORT_SYMBOL(serio_open); | 49 | EXPORT_SYMBOL(serio_open); |
@@ -64,7 +63,6 @@ static struct bus_type serio_bus; | |||
64 | 63 | ||
65 | static void serio_add_driver(struct serio_driver *drv); | 64 | static void serio_add_driver(struct serio_driver *drv); |
66 | static void serio_add_port(struct serio *serio); | 65 | static void serio_add_port(struct serio *serio); |
67 | static void serio_destroy_port(struct serio *serio); | ||
68 | static void serio_reconnect_port(struct serio *serio); | 66 | static void serio_reconnect_port(struct serio *serio); |
69 | static void serio_disconnect_port(struct serio *serio); | 67 | static void serio_disconnect_port(struct serio *serio); |
70 | 68 | ||
@@ -173,7 +171,6 @@ enum serio_event_type { | |||
173 | SERIO_RESCAN, | 171 | SERIO_RESCAN, |
174 | SERIO_RECONNECT, | 172 | SERIO_RECONNECT, |
175 | SERIO_REGISTER_PORT, | 173 | SERIO_REGISTER_PORT, |
176 | SERIO_UNREGISTER_PORT, | ||
177 | SERIO_REGISTER_DRIVER, | 174 | SERIO_REGISTER_DRIVER, |
178 | }; | 175 | }; |
179 | 176 | ||
@@ -307,11 +304,6 @@ static void serio_handle_event(void) | |||
307 | serio_add_port(event->object); | 304 | serio_add_port(event->object); |
308 | break; | 305 | break; |
309 | 306 | ||
310 | case SERIO_UNREGISTER_PORT: | ||
311 | serio_disconnect_port(event->object); | ||
312 | serio_destroy_port(event->object); | ||
313 | break; | ||
314 | |||
315 | case SERIO_RECONNECT: | 307 | case SERIO_RECONNECT: |
316 | serio_reconnect_port(event->object); | 308 | serio_reconnect_port(event->object); |
317 | break; | 309 | break; |
@@ -716,16 +708,6 @@ void serio_unregister_child_port(struct serio *serio) | |||
716 | mutex_unlock(&serio_mutex); | 708 | mutex_unlock(&serio_mutex); |
717 | } | 709 | } |
718 | 710 | ||
719 | /* | ||
720 | * Submits register request to kseriod for subsequent execution. | ||
721 | * Can be used when it is not obvious whether the serio_mutex is | ||
722 | * taken or not and when delayed execution is feasible. | ||
723 | */ | ||
724 | void __serio_unregister_port_delayed(struct serio *serio, struct module *owner) | ||
725 | { | ||
726 | serio_queue_event(serio, owner, SERIO_UNREGISTER_PORT); | ||
727 | } | ||
728 | |||
729 | 711 | ||
730 | /* | 712 | /* |
731 | * Serio driver operations | 713 | * Serio driver operations |
diff --git a/include/linux/serio.h b/include/linux/serio.h index b99c5ca970..8f52228390 100644 --- a/include/linux/serio.h +++ b/include/linux/serio.h | |||
@@ -85,11 +85,6 @@ static inline void serio_register_port(struct serio *serio) | |||
85 | 85 | ||
86 | void serio_unregister_port(struct serio *serio); | 86 | void serio_unregister_port(struct serio *serio); |
87 | void serio_unregister_child_port(struct serio *serio); | 87 | void serio_unregister_child_port(struct serio *serio); |
88 | void __serio_unregister_port_delayed(struct serio *serio, struct module *owner); | ||
89 | static inline void serio_unregister_port_delayed(struct serio *serio) | ||
90 | { | ||
91 | __serio_unregister_port_delayed(serio, THIS_MODULE); | ||
92 | } | ||
93 | 88 | ||
94 | void __serio_register_driver(struct serio_driver *drv, struct module *owner); | 89 | void __serio_register_driver(struct serio_driver *drv, struct module *owner); |
95 | static inline void serio_register_driver(struct serio_driver *drv) | 90 | static inline void serio_register_driver(struct serio_driver *drv) |