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 3cb99d454ecd89b7bb4006b7b20c304935f7ef8a..cd55ddb7df4fdffb8dcdadfbfad4eb9296dbf8e3 100644 (file)
--- 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 b99c5ca9708d42b7aa03e8c016cb03d1a1c6bbfc..8f52228390abec1b24fba5402cf7ea3b23637213 100644 (file)
--- 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)