diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2010-01-05 17:56:03 -0800 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2010-01-06 00:23:51 -0800 |
| commit | 361b7b5b032338361ea88412f1fc45479fdd5859 (patch) | |
| tree | aed4cc96a50f563a3adc1521d109269809a5b60f | |
| parent | cac9169bf75ea8cbaab75be9dbe5eb79a2bad6f5 (diff) | |
Input: gameport - let device core tell us if device was registered
No need to keep track of it by ourselves.
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| -rw-r--r-- | drivers/input/gameport/gameport.c | 6 | ||||
| -rw-r--r-- | include/linux/gameport.h | 1 |
2 files changed, 1 insertions, 6 deletions
diff --git a/drivers/input/gameport/gameport.c b/drivers/input/gameport/gameport.c index ac11be08585..f9e5f8e1690 100644 --- a/drivers/input/gameport/gameport.c +++ b/drivers/input/gameport/gameport.c @@ -561,8 +561,6 @@ static void gameport_add_port(struct gameport *gameport) printk(KERN_ERR "gameport: device_add() failed for %s (%s), error: %d\n", gameport->phys, gameport->name, error); - else - gameport->registered = 1; } /* @@ -584,10 +582,8 @@ static void gameport_destroy_port(struct gameport *gameport) gameport->parent = NULL; } - if (gameport->registered) { + if (device_is_registered(&gameport->dev)) device_del(&gameport->dev); - gameport->registered = 0; - } list_del_init(&gameport->node); diff --git a/include/linux/gameport.h b/include/linux/gameport.h index 1bc08541c2b..48e68da097f 100644 --- a/include/linux/gameport.h +++ b/include/linux/gameport.h @@ -46,7 +46,6 @@ struct gameport { struct mutex drv_mutex; /* protects serio->drv so attributes can pin driver */ struct device dev; - unsigned int registered; /* port has been fully registered with driver core */ struct list_head node; }; |