redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

Input: gameport - make use of list_first_entry() helper

Browse source 
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
This commit is contained in:
Dmitry Torokhov 2010-01-05 17:56:03 -08:00
parent 361b7b5b03
commit d621af4730
1 changed files with 11 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
drivers/input/gameport/gameport.c
View file

@ -298,14 +298,12 @@ static void gameport_free_event(struct gameport_event *event)
static void gameport_remove_duplicate_events(struct gameport_event *event) static void gameport_remove_duplicate_events(struct gameport_event *event)
{ {
struct list_head *node, *next; struct gameport_event *e, *next;
struct gameport_event *e;
unsigned long flags; unsigned long flags;
spin_lock_irqsave(&gameport_event_lock, flags); spin_lock_irqsave(&gameport_event_lock, flags);
list_for_each_safe(node, next, &gameport_event_list) { list_for_each_entry_safe(e, next, &gameport_event_list, node) {
e = list_entry(node, struct gameport_event, node);
if (event->object == e->object) { if (event->object == e->object) {
/* /*
* If this event is of different type we should not * If this event is of different type we should not
@ -315,7 +313,7 @@ static void gameport_remove_duplicate_events(struct gameport_event *event)
if (event->type != e->type) if (event->type != e->type)
break; break;
list_del_init(node); list_del_init(&e->node);
gameport_free_event(e); gameport_free_event(e);
} }
} }
@ -325,21 +323,17 @@ static void gameport_remove_duplicate_events(struct gameport_event *event)
static struct gameport_event *gameport_get_event(void) static struct gameport_event *gameport_get_event(void)
{ {
struct gameport_event *event; struct gameport_event *event = NULL;
struct list_head *node;
unsigned long flags; unsigned long flags;
spin_lock_irqsave(&gameport_event_lock, flags); spin_lock_irqsave(&gameport_event_lock, flags);
if (list_empty(&gameport_event_list)) { if (!list_empty(&gameport_event_list)) {
spin_unlock_irqrestore(&gameport_event_lock, flags); event = list_first_entry(&gameport_event_list,
return NULL; struct gameport_event, node);
list_del_init(&event->node);
} }
node = gameport_event_list.next;
event = list_entry(node, struct gameport_event, node);
list_del_init(node);
spin_unlock_irqrestore(&gameport_event_lock, flags); spin_unlock_irqrestore(&gameport_event_lock, flags);
return event; return event;
@ -385,16 +379,14 @@ static void gameport_handle_event(void)
*/ */
static void gameport_remove_pending_events(void *object) static void gameport_remove_pending_events(void *object)
{ {
struct list_head *node, *next; struct gameport_event *event, *next;
struct gameport_event *event;
unsigned long flags; unsigned long flags;
spin_lock_irqsave(&gameport_event_lock, flags); spin_lock_irqsave(&gameport_event_lock, flags);
list_for_each_safe(node, next, &gameport_event_list) { list_for_each_entry_safe(event, next, &gameport_event_list, node) {
event = list_entry(node, struct gameport_event, node);
if (event->object == object) { if (event->object == object) {
list_del_init(node); list_del_init(&event->node);
gameport_free_event(event); gameport_free_event(event);
} }
} }