Input: gameport - remove rescan/reconnect facilities

They have never been used and are unlikely to be used in the future
so remove them altogether.

Reported-by: Adrian Bunk <bunk@kernel.org>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>

diff --git a/drivers/input/gameport/gameport.c b/drivers/input/gameport/gameport.c
index c5600ac5feb3aa6c99dba80628d501d515488ebf..078e4eed0894ba45a495184bb91b6518935663b9 100644 (file)
--- a/drivers/input/gameport/gameport.c
+++ b/drivers/input/gameport/gameport.c
@@ -36,7 +36,6 @@ EXPORT_SYMBOL(__gameport_register_driver);
 EXPORT_SYMBOL(gameport_unregister_driver);
 EXPORT_SYMBOL(gameport_open);
 EXPORT_SYMBOL(gameport_close);
-EXPORT_SYMBOL(gameport_rescan);
 EXPORT_SYMBOL(gameport_set_phys);
 EXPORT_SYMBOL(gameport_start_polling);
 EXPORT_SYMBOL(gameport_stop_polling);
@@ -230,8 +229,6 @@ static void gameport_find_driver(struct gameport *gameport)
  */
 
 enum gameport_event_type {
-       GAMEPORT_RESCAN,
-       GAMEPORT_RECONNECT,
        GAMEPORT_REGISTER_PORT,
        GAMEPORT_REGISTER_DRIVER,
 };
@@ -365,15 +362,6 @@ static void gameport_handle_event(void)
                                gameport_add_port(event->object);
                                break;
 
-                       case GAMEPORT_RECONNECT:
-                               gameport_reconnect_port(event->object);
-                               break;
-
-                       case GAMEPORT_RESCAN:
-                               gameport_disconnect_port(event->object);
-                               gameport_find_driver(event->object);
-                               break;
-
                        case GAMEPORT_REGISTER_DRIVER:
                                gameport_add_driver(event->object);
                                break;
@@ -651,16 +639,6 @@ static void gameport_disconnect_port(struct gameport *gameport)
        device_release_driver(&gameport->dev);
 }
 
-void gameport_rescan(struct gameport *gameport)
-{
-       gameport_queue_event(gameport, NULL, GAMEPORT_RESCAN);
-}
-
-void gameport_reconnect(struct gameport *gameport)
-{
-       gameport_queue_event(gameport, NULL, GAMEPORT_RECONNECT);
-}
-
 /*
  * Submits register request to kgameportd for subsequent execution.
  * Note that port registration is always asynchronous.

diff --git a/include/linux/gameport.h b/include/linux/gameport.h
index afad95272841827445d8258043351ba0d23fcf4c..f64e29c0ef3f57be1b03aeb0703fe30f58ffbbeb 100644 (file)
--- a/include/linux/gameport.h
+++ b/include/linux/gameport.h
@@ -68,7 +68,6 @@ struct gameport_driver {
 
 int gameport_open(struct gameport *gameport, struct gameport_driver *drv, int mode);
 void gameport_close(struct gameport *gameport);
-void gameport_rescan(struct gameport *gameport);
 
 #if defined(CONFIG_GAMEPORT) || (defined(MODULE) && defined(CONFIG_GAMEPORT_MODULE))