Skip to content

Commit

Permalink
Input: serio - 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 386d877 commit ddf1ffb
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 7 deletions.
8 changes: 2 additions & 6 deletions drivers/input/serio/serio.c
Original file line number Diff line number Diff line change
Expand Up @@ -577,8 +577,6 @@ static void serio_add_port(struct serio *serio)
printk(KERN_ERR
"serio: device_add() failed for %s (%s), error: %d\n",
serio->phys, serio->name, error);
else
serio->registered = true;
}

/*
Expand All @@ -605,10 +603,8 @@ static void serio_destroy_port(struct serio *serio)
serio->parent = NULL;
}

if (serio->registered) {
if (device_is_registered(&serio->dev))
device_del(&serio->dev);
serio->registered = false;
}

list_del_init(&serio->node);
serio_remove_pending_events(serio);
Expand Down Expand Up @@ -995,7 +991,7 @@ irqreturn_t serio_interrupt(struct serio *serio,

if (likely(serio->drv)) {
ret = serio->drv->interrupt(serio, data, dfl);
} else if (!dfl && serio->registered) {
} else if (!dfl && device_is_registered(&serio->dev)) {
serio_rescan(serio);
ret = IRQ_HANDLED;
}
Expand Down
1 change: 0 additions & 1 deletion include/linux/serio.h
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ struct serio {
char phys[32];

bool manual_bind;
bool registered; /* port has been fully registered with driver core */

struct serio_device_id id;

Expand Down

0 comments on commit ddf1ffb

Please sign in to comment.