Skip to content

Commit

Permalink
Input: gameport - let device core tell us if device was registered
Browse files Browse the repository at this point in the history
No need to keep track of it by ourselves.

Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
  • Loading branch information
Dmitry Torokhov committed Jan 6, 2010
1 parent cac9169 commit 361b7b5
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 6 deletions.
6 changes: 1 addition & 5 deletions drivers/input/gameport/gameport.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

/*
Expand All @@ -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);

Expand Down
1 change: 0 additions & 1 deletion include/linux/gameport.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
};
Expand Down

0 comments on commit 361b7b5

Please sign in to comment.