From: Dmitry Torokhov <dtor@insightbb.com>
Date: Fri, 17 Nov 2006 06:07:39 +0000 (-0500)
Subject: Input: serio - remove serio_unregister_port_delayed()
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=9d92fe17b652f5496c97bc83fdfe925f3182f602;p=linux-beck.git

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>
---

diff --git a/drivers/input/serio/serio.c b/drivers/input/serio/serio.c
index 3cb99d454ecd..cd55ddb7df4f 100644
--- a/drivers/input/serio/serio.c
+++ b/drivers/input/serio/serio.c
@@ -44,7 +44,6 @@ EXPORT_SYMBOL(serio_interrupt);
 EXPORT_SYMBOL(__serio_register_port);
 EXPORT_SYMBOL(serio_unregister_port);
 EXPORT_SYMBOL(serio_unregister_child_port);
-EXPORT_SYMBOL(__serio_unregister_port_delayed);
 EXPORT_SYMBOL(__serio_register_driver);
 EXPORT_SYMBOL(serio_unregister_driver);
 EXPORT_SYMBOL(serio_open);
@@ -64,7 +63,6 @@ static struct bus_type serio_bus;
 
 static void serio_add_driver(struct serio_driver *drv);
 static void serio_add_port(struct serio *serio);
-static void serio_destroy_port(struct serio *serio);
 static void serio_reconnect_port(struct serio *serio);
 static void serio_disconnect_port(struct serio *serio);
 
@@ -173,7 +171,6 @@ enum serio_event_type {
 	SERIO_RESCAN,
 	SERIO_RECONNECT,
 	SERIO_REGISTER_PORT,
-	SERIO_UNREGISTER_PORT,
 	SERIO_REGISTER_DRIVER,
 };
 
@@ -307,11 +304,6 @@ static void serio_handle_event(void)
 				serio_add_port(event->object);
 				break;
 
-			case SERIO_UNREGISTER_PORT:
-				serio_disconnect_port(event->object);
-				serio_destroy_port(event->object);
-				break;
-
 			case SERIO_RECONNECT:
 				serio_reconnect_port(event->object);
 				break;
@@ -716,16 +708,6 @@ void serio_unregister_child_port(struct serio *serio)
 	mutex_unlock(&serio_mutex);
 }
 
-/*
- * Submits register request to kseriod for subsequent execution.
- * Can be used when it is not obvious whether the serio_mutex is
- * taken or not and when delayed execution is feasible.
- */
-void __serio_unregister_port_delayed(struct serio *serio, struct module *owner)
-{
-	serio_queue_event(serio, owner, SERIO_UNREGISTER_PORT);
-}
-
 
 /*
  * Serio driver operations
diff --git a/include/linux/serio.h b/include/linux/serio.h
index b99c5ca9708d..8f52228390ab 100644
--- a/include/linux/serio.h
+++ b/include/linux/serio.h
@@ -85,11 +85,6 @@ 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_unregister_port_delayed(struct serio *serio, struct module *owner);
-static inline void serio_unregister_port_delayed(struct serio *serio)
-{
-	__serio_unregister_port_delayed(serio, THIS_MODULE);
-}
 
 void __serio_register_driver(struct serio_driver *drv, struct module *owner);
 static inline void serio_register_driver(struct serio_driver *drv)