2 files changed, 14 insertions, 29 deletions

diff --git a/drivers/input/serio/i8042.c b/drivers/input/serio/i8042.c
index 7e3141f37e32..d365f227ac56 100644
--- a/drivers/input/serio/i8042.c
+++ b/drivers/input/serio/i8042.c
@@ -255,25 +255,10 @@ static int i8042_kbd_write(struct serio *port, unsigned char c)
 static int i8042_aux_write(struct serio *serio, unsigned char c)
 {
         struct i8042_port *port = serio->port_data;
-        int retval;
-
-/*
- * Send the byte out.
- */
-
-        if (port->mux == -1)
-                retval = i8042_command(&c, I8042_CMD_AUX_SEND);
-        else
-                retval = i8042_command(&c, I8042_CMD_MUX_SEND + port->mux);
 
-/*
- * Make sure the interrupt happens and the character is received even
- * in the case the IRQ isn't wired, so that we can receive further
- * characters later.
- */
-
-        i8042_interrupt(0, NULL);
-        return retval;
+        return i8042_command(&c, port->mux == -1 ?
+                                        I8042_CMD_AUX_SEND :
+                                        I8042_CMD_MUX_SEND + port->mux);
 }
 
 /*
diff --git a/drivers/input/serio/serio.c b/drivers/input/serio/serio.c
index 211943f85cb6..3cb99d454ecd 100644
--- a/drivers/input/serio/serio.c
+++ b/drivers/input/serio/serio.c
@@ -784,12 +784,6 @@ static int serio_driver_remove(struct device *dev)
         return 0;
 }
 
-static struct bus_type serio_bus = {
-        .name = "serio",
-        .probe = serio_driver_probe,
-        .remove = serio_driver_remove,
-};
-
 static void serio_add_driver(struct serio_driver *drv)
 {
         int error;
@@ -946,15 +940,21 @@ irqreturn_t serio_interrupt(struct serio *serio,
         return ret;
 }
 
+static struct bus_type serio_bus = {
+        .name           = "serio",
+        .dev_attrs      = serio_device_attrs,
+        .drv_attrs      = serio_driver_attrs,
+        .match          = serio_bus_match,
+        .uevent         = serio_uevent,
+        .probe          = serio_driver_probe,
+        .remove         = serio_driver_remove,
+        .resume         = serio_resume,
+};
+
 static int __init serio_init(void)
 {
         int error;
 
-        serio_bus.dev_attrs = serio_device_attrs;
-        serio_bus.drv_attrs = serio_driver_attrs;
-        serio_bus.match = serio_bus_match;
-        serio_bus.uevent = serio_uevent;
-        serio_bus.resume = serio_resume;
         error = bus_register(&serio_bus);
         if (error) {
                 printk(KERN_ERR "serio: failed to register serio bus, error: %d\n", error);