Input: serio - 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>

2 files changed, 2 insertions, 7 deletions

diff --git a/drivers/input/serio/serio.c b/drivers/input/serio/serio.c
index 0a278f9f1d3a..d89880450f77 100644
--- a/drivers/input/serio/serio.c
+++ b/drivers/input/serio/serio.c
@@ -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;
 }
 
 /*
@@ -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);
@@ -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;
         }
diff --git a/include/linux/serio.h b/include/linux/serio.h
index e2f3044d4a4a..d0fb702059cd 100644
--- a/include/linux/serio.h
+++ b/include/linux/serio.h
@@ -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;