From dd68d5be4c49baa5fc532ee36395ca5e3c684f28 Mon Sep 17 00:00:00 2001
From: Dmitry Torokhov <dtor@insightbb.com>
Date: Fri, 17 Nov 2006 01:07:39 -0500
Subject: [PATCH] --- yaml --- r: 40711 b: refs/heads/master c:
 9d92fe17b652f5496c97bc83fdfe925f3182f602 h: refs/heads/master i:   40709:
 6f34d03baa6e5c85430508b5a95b279a89652d32   40707:
 876b9837ddf2192a928461f0a0681a2922d51f10   40703:
 b27c2e0aa34c3469260e8367b4d052a7cc253acb v: v3

---
 [refs]                            |  2 +-
 trunk/drivers/input/serio/serio.c | 18 ------------------
 trunk/include/linux/serio.h       |  5 -----
 3 files changed, 1 insertion(+), 24 deletions(-)

diff --git a/[refs] b/[refs]
index 1481c2eccc79..00e8c3b466bc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f40219bf936bb677566f42758d505e27fad0908e
+refs/heads/master: 9d92fe17b652f5496c97bc83fdfe925f3182f602
diff --git a/trunk/drivers/input/serio/serio.c b/trunk/drivers/input/serio/serio.c
index 3cb99d454ecd..cd55ddb7df4f 100644
--- a/trunk/drivers/input/serio/serio.c
+++ b/trunk/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/trunk/include/linux/serio.h b/trunk/include/linux/serio.h
index b99c5ca9708d..8f52228390ab 100644
--- a/trunk/include/linux/serio.h
+++ b/trunk/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)