iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Input: serio - let device core tell us if device was registered

Browse Source 
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:04 -08:00
parent 386d877298
commit ddf1ffbd40
2 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/input/serio/serio.c
View File

@ -577,8 +577,6 @@ static void serio_add_port(struct serio *serio)
printk(KERN_ERR printk(KERN_ERR
"serio: device_add() failed for %s (%s), error: %d\n", "serio: device_add() failed for %s (%s), error: %d\n",
serio->phys, serio->name, error); serio->phys, serio->name, error);
else
serio->registered = true;
} }
/* /*
@ -605,10 +603,8 @@ static void serio_destroy_port(struct serio *serio)
serio->parent = NULL; serio->parent = NULL;
} }
if (serio->registered) { if (device_is_registered(&serio->dev))
device_del(&serio->dev); device_del(&serio->dev);
serio->registered = false;
}
list_del_init(&serio->node); list_del_init(&serio->node);
serio_remove_pending_events(serio); serio_remove_pending_events(serio);
@ -995,7 +991,7 @@ irqreturn_t serio_interrupt(struct serio *serio,
if (likely(serio->drv)) { if (likely(serio->drv)) {
ret = serio->drv->interrupt(serio, data, dfl); ret = serio->drv->interrupt(serio, data, dfl);
} else if (!dfl && serio->registered) { } else if (!dfl && device_is_registered(&serio->dev)) {
serio_rescan(serio); serio_rescan(serio);
ret = IRQ_HANDLED; ret = IRQ_HANDLED;
} }

1
include/linux/serio.h
View File

@ -30,7 +30,6 @@ struct serio {
char phys[32]; char phys[32];
bool manual_bind; bool manual_bind;
bool registered; /* port has been fully registered with driver core */
struct serio_device_id id; struct serio_device_id id;