openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Dmitry Torokhov 2010-01-05 17:56:03 -08:00
parent cac9169bf7
commit 361b7b5b03
2 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/input/gameport/gameport.c
View File

@ -561,8 +561,6 @@ static void gameport_add_port(struct gameport *gameport)
printk(KERN_ERR printk(KERN_ERR
"gameport: device_add() failed for %s (%s), error: %d\n", "gameport: device_add() failed for %s (%s), error: %d\n",
gameport->phys, gameport->name, error); gameport->phys, gameport->name, error);
else
gameport->registered = 1;
} }
/* /*
@ -584,10 +582,8 @@ static void gameport_destroy_port(struct gameport *gameport)
gameport->parent = NULL; gameport->parent = NULL;
} }
if (gameport->registered) { if (device_is_registered(&gameport->dev))
device_del(&gameport->dev); device_del(&gameport->dev);
gameport->registered = 0;
}
list_del_init(&gameport->node); list_del_init(&gameport->node);

1
include/linux/gameport.h
View File

@ -46,7 +46,6 @@ struct gameport {
struct mutex drv_mutex; /* protects serio->drv so attributes can pin driver */ struct mutex drv_mutex; /* protects serio->drv so attributes can pin driver */
struct device dev; struct device dev;
unsigned int registered; /* port has been fully registered with driver core */
struct list_head node; struct list_head node;
}; };