Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master

21 files changed, 809 insertions, 440 deletions

diff --git a/drivers/input/mouse/Kconfig b/drivers/input/mouse/Kconfig
index 3feeb3af8abd..c714ca2407f8 100644
--- a/drivers/input/mouse/Kconfig
+++ b/drivers/input/mouse/Kconfig
@@ -70,7 +70,7 @@ config MOUSE_PS2_SYNAPTICS
 config MOUSE_PS2_LIFEBOOK
         bool "Fujitsu Lifebook PS/2 mouse protocol extension" if EMBEDDED
         default y
-        depends on MOUSE_PS2 && X86
+        depends on MOUSE_PS2 && X86 && DMI
         help
           Say Y here if you have a Fujitsu B-series Lifebook PS/2
           TouchScreen connected to your system.
diff --git a/drivers/input/mouse/alps.c b/drivers/input/mouse/alps.c
index f36110689aae..99d58764ef03 100644
--- a/drivers/input/mouse/alps.c
+++ b/drivers/input/mouse/alps.c
@@ -5,6 +5,7 @@
  * Copyright (c) 2003-2005 Peter Osterlund <petero2@telia.com>
  * Copyright (c) 2004 Dmitry Torokhov <dtor@mail.ru>
  * Copyright (c) 2005 Vojtech Pavlik <vojtech@suse.cz>
+ * Copyright (c) 2009 Sebastian Kapfer <sebastian_kapfer@gmx.net>
  *
  * ALPS detection, tap switching and status querying info is taken from
  * tpconfig utility (by C. Scott Ananian and Bruce Kall).
@@ -14,6 +15,7 @@
  * the Free Software Foundation.
  */
 
+#include <linux/slab.h>
 #include <linux/input.h>
 #include <linux/serio.h>
 #include <linux/libps2.h>
@@ -28,13 +30,16 @@
 #define dbg(format, arg...) do {} while (0)
 #endif
 
-#define ALPS_DUALPOINT  0x01
-#define ALPS_WHEEL      0x02
-#define ALPS_FW_BK_1    0x04
-#define ALPS_4BTN       0x08
-#define ALPS_OLDPROTO   0x10
-#define ALPS_PASS       0x20
-#define ALPS_FW_BK_2    0x40
+#define ALPS_OLDPROTO           0x01    /* old style input */
+#define ALPS_DUALPOINT          0x02    /* touchpad has trackstick */
+#define ALPS_PASS               0x04    /* device has a pass-through port */
+
+#define ALPS_WHEEL              0x08    /* hardware wheel present */
+#define ALPS_FW_BK_1            0x10    /* front & back buttons present */
+#define ALPS_FW_BK_2            0x20    /* front & back buttons present */
+#define ALPS_FOUR_BUTTONS       0x40    /* 4 direction button present */
+#define ALPS_PS2_INTERLEAVED    0x80    /* 3-byte PS/2 packet interleaved with
+                                           6-byte ALPS packet */
 
 static const struct alps_model_info alps_model_data[] = {
         { { 0x32, 0x02, 0x14 }, 0xf8, 0xf8, ALPS_PASS | ALPS_DUALPOINT }, /* Toshiba Salellite Pro M10 */
@@ -55,8 +60,12 @@ static const struct alps_model_info alps_model_data[] = {
         { { 0x20, 0x02, 0x0e }, 0xf8, 0xf8, ALPS_PASS | ALPS_DUALPOINT }, /* XXX */
         { { 0x22, 0x02, 0x0a }, 0xf8, 0xf8, ALPS_PASS | ALPS_DUALPOINT },
         { { 0x22, 0x02, 0x14 }, 0xff, 0xff, ALPS_PASS | ALPS_DUALPOINT }, /* Dell Latitude D600 */
-        { { 0x62, 0x02, 0x14 }, 0xcf, 0xcf, ALPS_PASS | ALPS_DUALPOINT }, /* Dell Latitude E6500 */
-        { { 0x73, 0x02, 0x50 }, 0xcf, 0xcf, ALPS_FW_BK_1 },               /* Dell Vostro 1400 */
+        /* Dell Latitude E5500, E6400, E6500, Precision M4400 */
+        { { 0x62, 0x02, 0x14 }, 0xcf, 0xcf,
+                ALPS_PASS | ALPS_DUALPOINT | ALPS_PS2_INTERLEAVED },
+        { { 0x73, 0x02, 0x50 }, 0xcf, 0xcf, ALPS_FOUR_BUTTONS },          /* Dell Vostro 1400 */
+        { { 0x52, 0x01, 0x14 }, 0xff, 0xff,
+                ALPS_PASS | ALPS_DUALPOINT | ALPS_PS2_INTERLEAVED },      /* Toshiba Tecra A11-11L */
 };
 
 /*
@@ -66,42 +75,86 @@ static const struct alps_model_info alps_model_data[] = {
  */
 
 /*
- * ALPS abolute Mode - new format
+ * PS/2 packet format
+ *
+ * byte 0:  0    0 YSGN XSGN    1    M    R    L
+ * byte 1: X7   X6   X5   X4   X3   X2   X1   X0
+ * byte 2: Y7   Y6   Y5   Y4   Y3   Y2   Y1   Y0
+ *
+ * Note that the device never signals overflow condition.
+ *
+ * ALPS absolute Mode - new format
  *
  * byte 0:  1    ?    ?    ?    1    ?    ?    ?
  * byte 1:  0   x6   x5   x4   x3   x2   x1   x0
- * byte 2:  0   x10  x9   x8   x7    ?  fin  ges
+ * byte 2:  0  x10   x9   x8   x7    ?  fin  ges
  * byte 3:  0   y9   y8   y7    1    M    R    L
  * byte 4:  0   y6   y5   y4   y3   y2   y1   y0
  * byte 5:  0   z6   z5   z4   z3   z2   z1   z0
  *
+ * Dualpoint device -- interleaved packet format
+ *
+ * byte 0:    1    1    0    0    1    1    1    1
+ * byte 1:    0   x6   x5   x4   x3   x2   x1   x0
+ * byte 2:    0  x10   x9   x8   x7    0  fin  ges
+ * byte 3:    0    0 YSGN XSGN    1    1    1    1
+ * byte 4:   X7   X6   X5   X4   X3   X2   X1   X0
+ * byte 5:   Y7   Y6   Y5   Y4   Y3   Y2   Y1   Y0
+ * byte 6:    0   y9   y8   y7    1    m    r    l
+ * byte 7:    0   y6   y5   y4   y3   y2   y1   y0
+ * byte 8:    0   z6   z5   z4   z3   z2   z1   z0
+ *
+ * CAPITALS = stick, miniscules = touchpad
+ *
  * ?'s can have different meanings on different models,
  * such as wheel rotation, extra buttons, stick buttons
  * on a dualpoint, etc.
  */
 
+static bool alps_is_valid_first_byte(const struct alps_model_info *model,
+                                     unsigned char data)
+{
+        return (data & model->mask0) == model->byte0;
+}
+
+static void alps_report_buttons(struct psmouse *psmouse,
+                                struct input_dev *dev1, struct input_dev *dev2,
+                                int left, int right, int middle)
+{
+        struct input_dev *dev;
+
+        /*
+         * If shared button has already been reported on the
+         * other device (dev2) then this event should be also
+         * sent through that device.
+         */
+        dev = test_bit(BTN_LEFT, dev2->key) ? dev2 : dev1;
+        input_report_key(dev, BTN_LEFT, left);
+
+        dev = test_bit(BTN_RIGHT, dev2->key) ? dev2 : dev1;
+        input_report_key(dev, BTN_RIGHT, right);
+
+        dev = test_bit(BTN_MIDDLE, dev2->key) ? dev2 : dev1;
+        input_report_key(dev, BTN_MIDDLE, middle);
+
+        /*
+         * Sync the _other_ device now, we'll do the first
+         * device later once we report the rest of the events.
+         */
+        input_sync(dev2);
+}
+
 static void alps_process_packet(struct psmouse *psmouse)
 {
         struct alps_data *priv = psmouse->private;
+        const struct alps_model_info *model = priv->i;
         unsigned char *packet = psmouse->packet;
         struct input_dev *dev = psmouse->dev;
         struct input_dev *dev2 = priv->dev2;
         int x, y, z, ges, fin, left, right, middle;
         int back = 0, forward = 0;
 
-        if ((packet[0] & 0xc8) == 0x08) {   /* 3-byte PS/2 packet */
-                input_report_key(dev2, BTN_LEFT,   packet[0] & 1);
-                input_report_key(dev2, BTN_RIGHT,  packet[0] & 2);
-                input_report_key(dev2, BTN_MIDDLE, packet[0] & 4);
-                input_report_rel(dev2, REL_X,
-                        packet[1] ? packet[1] - ((packet[0] << 4) & 0x100) : 0);
-                input_report_rel(dev2, REL_Y,
-                        packet[2] ? ((packet[0] << 3) & 0x100) - packet[2] : 0);
-                input_sync(dev2);
-                return;
-        }
-
-        if (priv->i->flags & ALPS_OLDPROTO) {
+        if (model->flags & ALPS_OLDPROTO) {
                 left = packet[2] & 0x10;
                 right = packet[2] & 0x08;
                 middle = 0;
@@ -117,12 +170,12 @@ static void alps_process_packet(struct psmouse *psmouse)
                 z = packet[5];
         }
 
-        if (priv->i->flags & ALPS_FW_BK_1) {
+        if (model->flags & ALPS_FW_BK_1) {
                 back = packet[0] & 0x10;
                 forward = packet[2] & 4;
         }
 
-        if (priv->i->flags & ALPS_FW_BK_2) {
+        if (model->flags & ALPS_FW_BK_2) {
                 back = packet[3] & 4;
                 forward = packet[2] & 4;
                 if ((middle = forward && back))
@@ -132,25 +185,21 @@ static void alps_process_packet(struct psmouse *psmouse)
         ges = packet[2] & 1;
         fin = packet[2] & 2;
 
-        if ((priv->i->flags & ALPS_DUALPOINT) && z == 127) {
+        if ((model->flags & ALPS_DUALPOINT) && z == 127) {
                 input_report_rel(dev2, REL_X,  (x > 383 ? (x - 768) : x));
                 input_report_rel(dev2, REL_Y, -(y > 255 ? (y - 512) : y));
 
-                input_report_key(dev2, BTN_LEFT, left);
-                input_report_key(dev2, BTN_RIGHT, right);
-                input_report_key(dev2, BTN_MIDDLE, middle);
+                alps_report_buttons(psmouse, dev2, dev, left, right, middle);
 
-                input_sync(dev);
                 input_sync(dev2);
                 return;
         }
 
-        input_report_key(dev, BTN_LEFT, left);
-        input_report_key(dev, BTN_RIGHT, right);
-        input_report_key(dev, BTN_MIDDLE, middle);
+        alps_report_buttons(psmouse, dev, dev2, left, right, middle);
 
         /* Convert hardware tap to a reasonable Z value */
-        if (ges && !fin) z = 40;
+        if (ges && !fin)
+                z = 40;
 
         /*
          * A "tap and drag" operation is reported by the hardware as a transition
@@ -166,8 +215,10 @@ static void alps_process_packet(struct psmouse *psmouse)
         }
         priv->prev_fin = fin;
 
-        if (z > 30) input_report_key(dev, BTN_TOUCH, 1);
-        if (z < 25) input_report_key(dev, BTN_TOUCH, 0);
+        if (z > 30)
+                input_report_key(dev, BTN_TOUCH, 1);
+        if (z < 25)
+                input_report_key(dev, BTN_TOUCH, 0);
 
         if (z > 0) {
                 input_report_abs(dev, ABS_X, x);
@@ -177,36 +228,186 @@ static void alps_process_packet(struct psmouse *psmouse)
         input_report_abs(dev, ABS_PRESSURE, z);
         input_report_key(dev, BTN_TOOL_FINGER, z > 0);
 
-        if (priv->i->flags & ALPS_WHEEL)
+        if (model->flags & ALPS_WHEEL)
                 input_report_rel(dev, REL_WHEEL, ((packet[2] << 1) & 0x08) - ((packet[0] >> 4) & 0x07));
 
-        if (priv->i->flags & (ALPS_FW_BK_1 | ALPS_FW_BK_2)) {
+        if (model->flags & (ALPS_FW_BK_1 | ALPS_FW_BK_2)) {
                 input_report_key(dev, BTN_FORWARD, forward);
                 input_report_key(dev, BTN_BACK, back);
         }
 
+        if (model->flags & ALPS_FOUR_BUTTONS) {
+                input_report_key(dev, BTN_0, packet[2] & 4);
+                input_report_key(dev, BTN_1, packet[0] & 0x10);
+                input_report_key(dev, BTN_2, packet[3] & 4);
+                input_report_key(dev, BTN_3, packet[0] & 0x20);
+        }
+
         input_sync(dev);
 }
 
+static void alps_report_bare_ps2_packet(struct psmouse *psmouse,
+                                        unsigned char packet[],
+                                        bool report_buttons)
+{
+        struct alps_data *priv = psmouse->private;
+        struct input_dev *dev2 = priv->dev2;
+
+        if (report_buttons)
+                alps_report_buttons(psmouse, dev2, psmouse->dev,
+                                packet[0] & 1, packet[0] & 2, packet[0] & 4);
+
+        input_report_rel(dev2, REL_X,
+                packet[1] ? packet[1] - ((packet[0] << 4) & 0x100) : 0);
+        input_report_rel(dev2, REL_Y,
+                packet[2] ? ((packet[0] << 3) & 0x100) - packet[2] : 0);
+
+        input_sync(dev2);
+}
+
+static psmouse_ret_t alps_handle_interleaved_ps2(struct psmouse *psmouse)
+{
+        struct alps_data *priv = psmouse->private;
+
+        if (psmouse->pktcnt < 6)
+                return PSMOUSE_GOOD_DATA;
+
+        if (psmouse->pktcnt == 6) {
+                /*
+                 * Start a timer to flush the packet if it ends up last
+                 * 6-byte packet in the stream. Timer needs to fire
+                 * psmouse core times out itself. 20 ms should be enough
+                 * to decide if we are getting more data or not.
+                 */
+                mod_timer(&priv->timer, jiffies + msecs_to_jiffies(20));
+                return PSMOUSE_GOOD_DATA;
+        }
+
+        del_timer(&priv->timer);
+
+        if (psmouse->packet[6] & 0x80) {
+
+                /*
+                 * Highest bit is set - that means we either had
+                 * complete ALPS packet and this is start of the
+                 * next packet or we got garbage.
+                 */
+
+                if (((psmouse->packet[3] |
+                      psmouse->packet[4] |
+                      psmouse->packet[5]) & 0x80) ||
+                    (!alps_is_valid_first_byte(priv->i, psmouse->packet[6]))) {
+                        dbg("refusing packet %x %x %x %x "
+                            "(suspected interleaved ps/2)\n",
+                            psmouse->packet[3], psmouse->packet[4],
+                            psmouse->packet[5], psmouse->packet[6]);
+                        return PSMOUSE_BAD_DATA;
+                }
+
+                alps_process_packet(psmouse);
+
+                /* Continue with the next packet */
+                psmouse->packet[0] = psmouse->packet[6];
+                psmouse->pktcnt = 1;
+
+        } else {
+
+                /*
+                 * High bit is 0 - that means that we indeed got a PS/2
+                 * packet in the middle of ALPS packet.
+                 *
+                 * There is also possibility that we got 6-byte ALPS
+                 * packet followed  by 3-byte packet from trackpoint. We
+                 * can not distinguish between these 2 scenarios but
+                 * becase the latter is unlikely to happen in course of
+                 * normal operation (user would need to press all
+                 * buttons on the pad and start moving trackpoint
+                 * without touching the pad surface) we assume former.
+                 * Even if we are wrong the wost thing that would happen
+                 * the cursor would jump but we should not get protocol
+                 * desynchronization.
+                 */
+
+                alps_report_bare_ps2_packet(psmouse, &psmouse->packet[3],
+                                            false);
+
+                /*
+                 * Continue with the standard ALPS protocol handling,
+                 * but make sure we won't process it as an interleaved
+                 * packet again, which may happen if all buttons are
+                 * pressed. To avoid this let's reset the 4th bit which
+                 * is normally 1.
+                 */
+                psmouse->packet[3] = psmouse->packet[6] & 0xf7;
+                psmouse->pktcnt = 4;
+        }
+
+        return PSMOUSE_GOOD_DATA;
+}
+
+static void alps_flush_packet(unsigned long data)
+{
+        struct psmouse *psmouse = (struct psmouse *)data;
+
+        serio_pause_rx(psmouse->ps2dev.serio);
+
+        if (psmouse->pktcnt == 6) {
+
+                /*
+                 * We did not any more data in reasonable amount of time.
+                 * Validate the last 3 bytes and process as a standard
+                 * ALPS packet.
+                 */
+                if ((psmouse->packet[3] |
+                     psmouse->packet[4] |
+                     psmouse->packet[5]) & 0x80) {
+                        dbg("refusing packet %x %x %x "
+                            "(suspected interleaved ps/2)\n",
+                            psmouse->packet[3], psmouse->packet[4],
+                            psmouse->packet[5]);
+                } else {
+                        alps_process_packet(psmouse);
+                }
+                psmouse->pktcnt = 0;
+        }
+
+        serio_continue_rx(psmouse->ps2dev.serio);
+}
+
 static psmouse_ret_t alps_process_byte(struct psmouse *psmouse)
 {
         struct alps_data *priv = psmouse->private;
+        const struct alps_model_info *model = priv->i;
 
         if ((psmouse->packet[0] & 0xc8) == 0x08) { /* PS/2 packet */
                 if (psmouse->pktcnt == 3) {
-                        alps_process_packet(psmouse);
+                        alps_report_bare_ps2_packet(psmouse, psmouse->packet,
+                                                    true);
                         return PSMOUSE_FULL_PACKET;
                 }
                 return PSMOUSE_GOOD_DATA;
         }
 
-        if ((psmouse->packet[0] & priv->i->mask0) != priv->i->byte0)
+        /* Check for PS/2 packet stuffed in the middle of ALPS packet. */
+
+        if ((model->flags & ALPS_PS2_INTERLEAVED) &&
+            psmouse->pktcnt >= 4 && (psmouse->packet[3] & 0x0f) == 0x0f) {
+                return alps_handle_interleaved_ps2(psmouse);
+        }
+
+        if (!alps_is_valid_first_byte(model, psmouse->packet[0])) {
+                dbg("refusing packet[0] = %x (mask0 = %x, byte0 = %x)\n",
+                    psmouse->packet[0], model->mask0, model->byte0);
                 return PSMOUSE_BAD_DATA;
+        }
 
         /* Bytes 2 - 6 should have 0 in the highest bit */
         if (psmouse->pktcnt >= 2 && psmouse->pktcnt <= 6 &&
-            (psmouse->packet[psmouse->pktcnt - 1] & 0x80))
+            (psmouse->packet[psmouse->pktcnt - 1] & 0x80)) {
+                dbg("refusing packet[%i] = %x\n",
+                    psmouse->pktcnt - 1, psmouse->packet[psmouse->pktcnt - 1]);
                 return PSMOUSE_BAD_DATA;
+        }
 
         if (psmouse->pktcnt == 6) {
                 alps_process_packet(psmouse);
@@ -393,15 +594,12 @@ static int alps_poll(struct psmouse *psmouse)
         return 0;
 }
 
-static int alps_hw_init(struct psmouse *psmouse, int *version)
+static int alps_hw_init(struct psmouse *psmouse)
 {
         struct alps_data *priv = psmouse->private;
+        const struct alps_model_info *model = priv->i;
 
-        priv->i = alps_get_model(psmouse, version);
-        if (!priv->i)
-                return -1;
-
-        if ((priv->i->flags & ALPS_PASS) &&
+        if ((model->flags & ALPS_PASS) &&
             alps_passthrough_mode(psmouse, true)) {
                 return -1;
         }
@@ -416,7 +614,7 @@ static int alps_hw_init(struct psmouse *psmouse, int *version)
                 return -1;
         }
 
-        if ((priv->i->flags & ALPS_PASS) &&
+        if ((model->flags & ALPS_PASS) &&
             alps_passthrough_mode(psmouse, false)) {
                 return -1;
         }
@@ -432,12 +630,15 @@ static int alps_hw_init(struct psmouse *psmouse, int *version)
 
 static int alps_reconnect(struct psmouse *psmouse)
 {
+        const struct alps_model_info *model;
+
         psmouse_reset(psmouse);
 
-        if (alps_hw_init(psmouse, NULL))
+        model = alps_get_model(psmouse, NULL);
+        if (!model)
                 return -1;
 
-        return 0;
+        return alps_hw_init(psmouse);
 }
 
 static void alps_disconnect(struct psmouse *psmouse)
@@ -445,6 +646,7 @@ static void alps_disconnect(struct psmouse *psmouse)
         struct alps_data *priv = psmouse->private;
 
         psmouse_reset(psmouse);
+        del_timer_sync(&priv->timer);
         input_unregister_device(priv->dev2);
         kfree(priv);
 }
@@ -452,6 +654,7 @@ static void alps_disconnect(struct psmouse *psmouse)
 int alps_init(struct psmouse *psmouse)
 {
         struct alps_data *priv;
+        const struct alps_model_info *model;
         struct input_dev *dev1 = psmouse->dev, *dev2;
         int version;
 
@@ -461,35 +664,63 @@ int alps_init(struct psmouse *psmouse)
                 goto init_fail;
 
         priv->dev2 = dev2;
+        setup_timer(&priv->timer, alps_flush_packet, (unsigned long)psmouse);
+
         psmouse->private = priv;
 
-        if (alps_hw_init(psmouse, &version))
+        model = alps_get_model(psmouse, &version);
+        if (!model)
+                goto init_fail;
+
+        priv->i = model;
+
+        if (alps_hw_init(psmouse))
                 goto init_fail;
 
+        /*
+         * Undo part of setup done for us by psmouse core since touchpad
+         * is not a relative device.
+         */
+        __clear_bit(EV_REL, dev1->evbit);
+        __clear_bit(REL_X, dev1->relbit);
+        __clear_bit(REL_Y, dev1->relbit);
+
+        /*
+         * Now set up our capabilities.
+         */
         dev1->evbit[BIT_WORD(EV_KEY)] |= BIT_MASK(EV_KEY);
         dev1->keybit[BIT_WORD(BTN_TOUCH)] |= BIT_MASK(BTN_TOUCH);
         dev1->keybit[BIT_WORD(BTN_TOOL_FINGER)] |= BIT_MASK(BTN_TOOL_FINGER);
-        dev1->keybit[BIT_WORD(BTN_LEFT)] |= BIT_MASK(BTN_LEFT) |
-                BIT_MASK(BTN_MIDDLE) | BIT_MASK(BTN_RIGHT);
+        dev1->keybit[BIT_WORD(BTN_LEFT)] |=
+                BIT_MASK(BTN_LEFT) | BIT_MASK(BTN_RIGHT);
 
         dev1->evbit[BIT_WORD(EV_ABS)] |= BIT_MASK(EV_ABS);
         input_set_abs_params(dev1, ABS_X, 0, 1023, 0, 0);
         input_set_abs_params(dev1, ABS_Y, 0, 767, 0, 0);
         input_set_abs_params(dev1, ABS_PRESSURE, 0, 127, 0, 0);
 
-        if (priv->i->flags & ALPS_WHEEL) {
+        if (model->flags & ALPS_WHEEL) {
                 dev1->evbit[BIT_WORD(EV_REL)] |= BIT_MASK(EV_REL);
                 dev1->relbit[BIT_WORD(REL_WHEEL)] |= BIT_MASK(REL_WHEEL);
         }
 
-        if (priv->i->flags & (ALPS_FW_BK_1 | ALPS_FW_BK_2)) {
+        if (model->flags & (ALPS_FW_BK_1 | ALPS_FW_BK_2)) {
                 dev1->keybit[BIT_WORD(BTN_FORWARD)] |= BIT_MASK(BTN_FORWARD);
                 dev1->keybit[BIT_WORD(BTN_BACK)] |= BIT_MASK(BTN_BACK);
         }
 
+        if (model->flags & ALPS_FOUR_BUTTONS) {
+                dev1->keybit[BIT_WORD(BTN_0)] |= BIT_MASK(BTN_0);
+                dev1->keybit[BIT_WORD(BTN_1)] |= BIT_MASK(BTN_1);
+                dev1->keybit[BIT_WORD(BTN_2)] |= BIT_MASK(BTN_2);
+                dev1->keybit[BIT_WORD(BTN_3)] |= BIT_MASK(BTN_3);
+        } else {
+                dev1->keybit[BIT_WORD(BTN_MIDDLE)] |= BIT_MASK(BTN_MIDDLE);
+        }
+
         snprintf(priv->phys, sizeof(priv->phys), "%s/input1", psmouse->ps2dev.serio->phys);
         dev2->phys = priv->phys;
-        dev2->name = (priv->i->flags & ALPS_DUALPOINT) ? "DualPoint Stick" : "PS/2 Mouse";
+        dev2->name = (model->flags & ALPS_DUALPOINT) ? "DualPoint Stick" : "PS/2 Mouse";
         dev2->id.bustype = BUS_I8042;
         dev2->id.vendor  = 0x0002;
         dev2->id.product = PSMOUSE_ALPS;
@@ -497,9 +728,9 @@ int alps_init(struct psmouse *psmouse)
         dev2->dev.parent = &psmouse->ps2dev.serio->dev;
 
         dev2->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_REL);
-        dev2->relbit[BIT_WORD(REL_X)] |= BIT_MASK(REL_X) | BIT_MASK(REL_Y);
-        dev2->keybit[BIT_WORD(BTN_LEFT)] |= BIT_MASK(BTN_LEFT) |
-                BIT_MASK(BTN_MIDDLE) | BIT_MASK(BTN_RIGHT);
+        dev2->relbit[BIT_WORD(REL_X)] = BIT_MASK(REL_X) | BIT_MASK(REL_Y);
+        dev2->keybit[BIT_WORD(BTN_LEFT)] =
+                BIT_MASK(BTN_LEFT) | BIT_MASK(BTN_MIDDLE) | BIT_MASK(BTN_RIGHT);
 
         if (input_register_device(priv->dev2))
                 goto init_fail;
diff --git a/drivers/input/mouse/alps.h b/drivers/input/mouse/alps.h
index bc87936fee1a..904ed8b3c8be 100644
--- a/drivers/input/mouse/alps.h
+++ b/drivers/input/mouse/alps.h
@@ -23,6 +23,7 @@ struct alps_data {
         char phys[32];                  /* Phys */
         const struct alps_model_info *i;/* Info */
         int prev_fin;                   /* Finger bit from previous packet */
+        struct timer_list timer;
 };
 
 #ifdef CONFIG_MOUSE_PS2_ALPS
diff --git a/drivers/input/mouse/appletouch.c b/drivers/input/mouse/appletouch.c
index 908b5b44052f..53ec7ddd1826 100644
--- a/drivers/input/mouse/appletouch.c
+++ b/drivers/input/mouse/appletouch.c
@@ -205,8 +205,8 @@ struct atp {
         bool                    overflow_warned;
         int                     x_old;          /* last reported x/y, */
         int                     y_old;          /* used for smoothing */
-        signed char             xy_cur[ATP_XSENSORS + ATP_YSENSORS];
-        signed char             xy_old[ATP_XSENSORS + ATP_YSENSORS];
+        u8                      xy_cur[ATP_XSENSORS + ATP_YSENSORS];
+        u8                      xy_old[ATP_XSENSORS + ATP_YSENSORS];
         int                     xy_acc[ATP_XSENSORS + ATP_YSENSORS];
         int                     idlecount;      /* number of empty packets */
         struct work_struct      work;
@@ -531,7 +531,7 @@ static void atp_complete_geyser_1_2(struct urb *urb)
 
         for (i = 0; i < ATP_XSENSORS + ATP_YSENSORS; i++) {
                 /* accumulate the change */
-                signed char change = dev->xy_old[i] - dev->xy_cur[i];
+                int change = dev->xy_old[i] - dev->xy_cur[i];
                 dev->xy_acc[i] -= change;
 
                 /* prevent down drifting */
diff --git a/drivers/input/mouse/bcm5974.c b/drivers/input/mouse/bcm5974.c
index 0d1d33468b43..b89879bd860f 100644
--- a/drivers/input/mouse/bcm5974.c
+++ b/drivers/input/mouse/bcm5974.c
@@ -139,6 +139,7 @@ struct tp_finger {
 /* trackpad finger data size, empirically at least ten fingers */
 #define SIZEOF_FINGER           sizeof(struct tp_finger)
 #define SIZEOF_ALL_FINGERS      (16 * SIZEOF_FINGER)
+#define MAX_FINGER_ORIENTATION  16384
 
 /* device-specific parameters */
 struct bcm5974_param {
@@ -284,6 +285,26 @@ static void setup_events_to_report(struct input_dev *input_dev,
         input_set_abs_params(input_dev, ABS_Y,
                                 0, cfg->y.dim, cfg->y.fuzz, 0);
 
+        /* finger touch area */
+        input_set_abs_params(input_dev, ABS_MT_TOUCH_MAJOR,
+                             cfg->w.devmin, cfg->w.devmax, 0, 0);
+        input_set_abs_params(input_dev, ABS_MT_TOUCH_MINOR,
+                             cfg->w.devmin, cfg->w.devmax, 0, 0);
+        /* finger approach area */
+        input_set_abs_params(input_dev, ABS_MT_WIDTH_MAJOR,
+                             cfg->w.devmin, cfg->w.devmax, 0, 0);
+        input_set_abs_params(input_dev, ABS_MT_WIDTH_MINOR,
+                             cfg->w.devmin, cfg->w.devmax, 0, 0);
+        /* finger orientation */
+        input_set_abs_params(input_dev, ABS_MT_ORIENTATION,
+                             -MAX_FINGER_ORIENTATION,
+                             MAX_FINGER_ORIENTATION, 0, 0);
+        /* finger position */
+        input_set_abs_params(input_dev, ABS_MT_POSITION_X,
+                             cfg->x.devmin, cfg->x.devmax, 0, 0);
+        input_set_abs_params(input_dev, ABS_MT_POSITION_Y,
+                             cfg->y.devmin, cfg->y.devmax, 0, 0);
+
         __set_bit(EV_KEY, input_dev->evbit);
         __set_bit(BTN_TOUCH, input_dev->keybit);
         __set_bit(BTN_TOOL_FINGER, input_dev->keybit);
@@ -310,13 +331,29 @@ static int report_bt_state(struct bcm5974 *dev, int size)
         return 0;
 }
 
+static void report_finger_data(struct input_dev *input,
+                               const struct bcm5974_config *cfg,
+                               const struct tp_finger *f)
+{
+        input_report_abs(input, ABS_MT_TOUCH_MAJOR, raw2int(f->force_major));
+        input_report_abs(input, ABS_MT_TOUCH_MINOR, raw2int(f->force_minor));
+        input_report_abs(input, ABS_MT_WIDTH_MAJOR, raw2int(f->size_major));
+        input_report_abs(input, ABS_MT_WIDTH_MINOR, raw2int(f->size_minor));
+        input_report_abs(input, ABS_MT_ORIENTATION,
+                         MAX_FINGER_ORIENTATION - raw2int(f->orientation));
+        input_report_abs(input, ABS_MT_POSITION_X, raw2int(f->abs_x));
+        input_report_abs(input, ABS_MT_POSITION_Y,
+                         cfg->y.devmin + cfg->y.devmax - raw2int(f->abs_y));
+        input_mt_sync(input);
+}
+
 /* report trackpad data as logical trackpad state */
 static int report_tp_state(struct bcm5974 *dev, int size)
 {
         const struct bcm5974_config *c = &dev->cfg;
         const struct tp_finger *f;
         struct input_dev *input = dev->input;
-        int raw_p, raw_w, raw_x, raw_y, raw_n;
+        int raw_p, raw_w, raw_x, raw_y, raw_n, i;
         int ptest, origin, ibt = 0, nmin = 0, nmax = 0;
         int abs_p = 0, abs_w = 0, abs_x = 0, abs_y = 0;
 
@@ -329,6 +366,11 @@ static int report_tp_state(struct bcm5974 *dev, int size)
 
         /* always track the first finger; when detached, start over */
         if (raw_n) {
+
+                /* report raw trackpad data */
+                for (i = 0; i < raw_n; i++)
+                        report_finger_data(input, c, &f[i]);
+
                 raw_p = raw2int(f->force_major);
                 raw_w = raw2int(f->size_major);
                 raw_x = raw2int(f->abs_x);
@@ -761,7 +803,6 @@ static struct usb_driver bcm5974_driver = {
         .disconnect             = bcm5974_disconnect,
         .suspend                = bcm5974_suspend,
         .resume                 = bcm5974_resume,
-        .reset_resume           = bcm5974_resume,
         .id_table               = bcm5974_table,
         .supports_autosuspend   = 1,
 };
diff --git a/drivers/input/mouse/elantech.c b/drivers/input/mouse/elantech.c
index fda35e615abf..112b4ee52ff2 100644
--- a/drivers/input/mouse/elantech.c
+++ b/drivers/input/mouse/elantech.c
@@ -11,6 +11,7 @@
  */
 
 #include <linux/delay.h>
+#include <linux/slab.h>
 #include <linux/module.h>
 #include <linux/input.h>
 #include <linux/serio.h>
@@ -24,6 +25,10 @@
                         printk(KERN_DEBUG format, ##arg);       \
         } while (0)
 
+static bool force_elantech;
+module_param_named(force_elantech, force_elantech, bool, 0644);
+MODULE_PARM_DESC(force_elantech, "Force the Elantech PS/2 protocol extension to be used, 1 = enabled, 0 = disabled (default).");
+
 /*
  * Send a Synaptics style sliced query command
  */
@@ -180,14 +185,18 @@ static void elantech_report_absolute_v1(struct psmouse *psmouse)
         int fingers;
         static int old_fingers;
 
-        if (etd->fw_version_maj == 0x01) {
-                /* byte 0:  D   U  p1  p2   1  p3   R   L
-                   byte 1:  f   0  th  tw  x9  x8  y9  y8 */
+        if (etd->fw_version < 0x020000) {
+                /*
+                 * byte 0:  D   U  p1  p2   1  p3   R   L
+                 * byte 1:  f   0  th  tw  x9  x8  y9  y8
+                 */
                 fingers = ((packet[1] & 0x80) >> 7) +
                                 ((packet[1] & 0x30) >> 4);
         } else {
-                /* byte 0: n1  n0  p2  p1   1  p3   R   L
-                   byte 1:  0   0   0   0  x9  x8  y9  y8 */
+                /*
+                 * byte 0: n1  n0  p2  p1   1  p3   R   L
+                 * byte 1:  0   0   0   0  x9  x8  y9  y8
+                 */
                 fingers = (packet[0] & 0xc0) >> 6;
         }
 
@@ -201,13 +210,15 @@ static void elantech_report_absolute_v1(struct psmouse *psmouse)
 
         input_report_key(dev, BTN_TOUCH, fingers != 0);
 
-        /* byte 2: x7  x6  x5  x4  x3  x2  x1  x0
-           byte 3: y7  y6  y5  y4  y3  y2  y1  y0 */
+        /*
+         * byte 2: x7  x6  x5  x4  x3  x2  x1  x0
+         * byte 3: y7  y6  y5  y4  y3  y2  y1  y0
+         */
         if (fingers) {
                 input_report_abs(dev, ABS_X,
                         ((packet[1] & 0x0c) << 6) | packet[2]);
-                input_report_abs(dev, ABS_Y, ETP_YMAX_V1 -
-                        (((packet[1] & 0x03) << 8) | packet[3]));
+                input_report_abs(dev, ABS_Y,
+                        ETP_YMAX_V1 - (((packet[1] & 0x03) << 8) | packet[3]));
         }
 
         input_report_key(dev, BTN_TOOL_FINGER, fingers == 1);
@@ -216,7 +227,7 @@ static void elantech_report_absolute_v1(struct psmouse *psmouse)
         input_report_key(dev, BTN_LEFT, packet[0] & 0x01);
         input_report_key(dev, BTN_RIGHT, packet[0] & 0x02);
 
-        if ((etd->fw_version_maj == 0x01) &&
+        if (etd->fw_version < 0x020000 &&
             (etd->capabilities & ETP_CAP_HAS_ROCKER)) {
                 /* rocker up */
                 input_report_key(dev, BTN_FORWARD, packet[0] & 0x40);
@@ -246,34 +257,47 @@ static void elantech_report_absolute_v2(struct psmouse *psmouse)
 
         switch (fingers) {
         case 1:
-                /* byte 1: x15 x14 x13 x12 x11 x10 x9  x8
-                   byte 2: x7  x6  x5  x4  x4  x2  x1  x0 */
-                input_report_abs(dev, ABS_X, (packet[1] << 8) | packet[2]);
-                /* byte 4: y15 y14 y13 y12 y11 y10 y8  y8
-                   byte 5: y7  y6  y5  y4  y3  y2  y1  y0 */
-                input_report_abs(dev, ABS_Y, ETP_YMAX_V2 -
-                        ((packet[4] << 8) | packet[5]));
+                /*
+                 * byte 1:  .   .   .   .   .  x10 x9  x8
+                 * byte 2: x7  x6  x5  x4  x4  x2  x1  x0
+                 */
+                input_report_abs(dev, ABS_X,
+                        ((packet[1] & 0x07) << 8) | packet[2]);
+                /*
+                 * byte 4:  .   .   .   .   .   .  y9  y8
+                 * byte 5: y7  y6  y5  y4  y3  y2  y1  y0
+                 */
+                input_report_abs(dev, ABS_Y,
+                        ETP_YMAX_V2 - (((packet[4] & 0x03) << 8) | packet[5]));
                 break;
 
         case 2:
-                /* The coordinate of each finger is reported separately with
-                   a lower resolution for two finger touches */
-                /* byte 0:  .   .  ay8 ax8  .   .   .   .
-                   byte 1: ax7 ax6 ax5 ax4 ax3 ax2 ax1 ax0 */
+                /*
+                 * The coordinate of each finger is reported separately
+                 * with a lower resolution for two finger touches:
+                 * byte 0:  .   .  ay8 ax8  .   .   .   .
+                 * byte 1: ax7 ax6 ax5 ax4 ax3 ax2 ax1 ax0
+                 */
                 x1 = ((packet[0] & 0x10) << 4) | packet[1];
                 /* byte 2: ay7 ay6 ay5 ay4 ay3 ay2 ay1 ay0 */
                 y1 = ETP_2FT_YMAX - (((packet[0] & 0x20) << 3) | packet[2]);
-                /* byte 3:  .   .  by8 bx8  .   .   .   .
-                   byte 4: bx7 bx6 bx5 bx4 bx3 bx2 bx1 bx0 */
+                /*
+                 * byte 3:  .   .  by8 bx8  .   .   .   .
+                 * byte 4: bx7 bx6 bx5 bx4 bx3 bx2 bx1 bx0
+                 */
                 x2 = ((packet[3] & 0x10) << 4) | packet[4];
                 /* byte 5: by7 by8 by5 by4 by3 by2 by1 by0 */
                 y2 = ETP_2FT_YMAX - (((packet[3] & 0x20) << 3) | packet[5]);
-                /* For compatibility with the X Synaptics driver scale up one
-                   coordinate and report as ordinary mouse movent */
+                /*
+                 * For compatibility with the X Synaptics driver scale up
+                 * one coordinate and report as ordinary mouse movent
+                 */
                 input_report_abs(dev, ABS_X, x1 << 2);
                 input_report_abs(dev, ABS_Y, y1 << 2);
-                /* For compatibility with the proprietary X Elantech driver
-                   report both coordinates as hat coordinates */
+                /*
+                 * For compatibility with the proprietary X Elantech driver
+                 * report both coordinates as hat coordinates
+                 */
                 input_report_abs(dev, ABS_HAT0X, x1);
                 input_report_abs(dev, ABS_HAT0Y, y1);
                 input_report_abs(dev, ABS_HAT1X, x2);
@@ -297,7 +321,7 @@ static int elantech_check_parity_v1(struct psmouse *psmouse)
         unsigned char p1, p2, p3;
 
         /* Parity bits are placed differently */
-        if (etd->fw_version_maj == 0x01) {
+        if (etd->fw_version < 0x020000) {
                 /* byte 0:  D   U  p1  p2   1  p3   R   L */
                 p1 = (packet[0] & 0x20) >> 5;
                 p2 = (packet[0] & 0x10) >> 4;
@@ -420,6 +444,7 @@ static void elantech_set_input_params(struct psmouse *psmouse)
 
         __set_bit(EV_KEY, dev->evbit);
         __set_bit(EV_ABS, dev->evbit);
+        __clear_bit(EV_REL, dev->evbit);
 
         __set_bit(BTN_LEFT, dev->keybit);
         __set_bit(BTN_RIGHT, dev->keybit);
@@ -432,7 +457,7 @@ static void elantech_set_input_params(struct psmouse *psmouse)
         switch (etd->hw_version) {
         case 1:
                 /* Rocker button */
-                if ((etd->fw_version_maj == 0x01) &&
+                if (etd->fw_version < 0x020000 &&
                     (etd->capabilities & ETP_CAP_HAS_ROCKER)) {
                         __set_bit(BTN_FORWARD, dev->keybit);
                         __set_bit(BTN_BACK, dev->keybit);
@@ -594,8 +619,12 @@ int elantech_detect(struct psmouse *psmouse, bool set_properties)
                  param[0], param[1], param[2]);
 
         if (param[0] == 0 || param[1] != 0) {
-                pr_debug("elantech.c: Probably not a real Elantech touchpad. Aborting.\n");
-                return -1;
+                if (!force_elantech) {
+                        pr_debug("elantech.c: Probably not a real Elantech touchpad. Aborting.\n");
+                        return -1;
+                }
+
+                pr_debug("elantech.c: Probably not a real Elantech touchpad. Enabling anyway due to force_elantech.\n");
         }
 
         if (set_properties) {
@@ -657,14 +686,14 @@ int elantech_init(struct psmouse *psmouse)
                 pr_err("elantech.c: failed to query firmware version.\n");
                 goto init_fail;
         }
-        etd->fw_version_maj = param[0];
-        etd->fw_version_min = param[2];
+
+        etd->fw_version = (param[0] << 16) | (param[1] << 8) | param[2];
 
         /*
          * Assume every version greater than this is new EeePC style
          * hardware with 6 byte packets
          */
-        if (etd->fw_version_maj >= 0x02 && etd->fw_version_min >= 0x30) {
+        if (etd->fw_version >= 0x020030) {
                 etd->hw_version = 2;
                 /* For now show extra debug information */
                 etd->debug = 1;
@@ -674,8 +703,9 @@ int elantech_init(struct psmouse *psmouse)
                 etd->hw_version = 1;
                 etd->paritycheck = 1;
         }
-        pr_info("elantech.c: assuming hardware version %d, firmware version %d.%d\n",
-                etd->hw_version, etd->fw_version_maj, etd->fw_version_min);
+
+        pr_info("elantech.c: assuming hardware version %d, firmware version %d.%d.%d\n",
+                etd->hw_version, param[0], param[1], param[2]);
 
         if (synaptics_send_cmd(psmouse, ETP_CAPABILITIES_QUERY, param)) {
                 pr_err("elantech.c: failed to query capabilities.\n");
@@ -690,8 +720,8 @@ int elantech_init(struct psmouse *psmouse)
          * a touch action starts causing the mouse cursor or scrolled page
          * to jump. Enable a workaround.
          */
-        if (etd->fw_version_maj == 0x02 && etd->fw_version_min == 0x22) {
-                pr_info("elantech.c: firmware version 2.34 detected, "
+        if (etd->fw_version == 0x020022) {
+                pr_info("elantech.c: firmware version 2.0.34 detected, "
                         "enabling jumpy cursor workaround\n");
                 etd->jumpy_cursor = 1;
         }
diff --git a/drivers/input/mouse/elantech.h b/drivers/input/mouse/elantech.h
index feac5f7af966..ac57bde1bb9f 100644
--- a/drivers/input/mouse/elantech.h
+++ b/drivers/input/mouse/elantech.h
@@ -100,11 +100,10 @@ struct elantech_data {
         unsigned char reg_26;
         unsigned char debug;
         unsigned char capabilities;
-        unsigned char fw_version_maj;
-        unsigned char fw_version_min;
-        unsigned char hw_version;
         unsigned char paritycheck;
         unsigned char jumpy_cursor;
+        unsigned char hw_version;
+        unsigned int  fw_version;
         unsigned char parity[256];
 };
 
diff --git a/drivers/input/mouse/hgpk.c b/drivers/input/mouse/hgpk.c
index de1e553028b7..08d66d820d2b 100644
--- a/drivers/input/mouse/hgpk.c
+++ b/drivers/input/mouse/hgpk.c
@@ -30,6 +30,7 @@
  */
 
 #define DEBUG
+#include <linux/slab.h>
 #include <linux/input.h>
 #include <linux/serio.h>
 #include <linux/libps2.h>
@@ -68,10 +69,6 @@ module_param(post_interrupt_delay, int, 0644);
 MODULE_PARM_DESC(post_interrupt_delay,
         "delay (ms) before recal after recal interrupt detected");
 
-static int autorecal = 1;
-module_param(autorecal, int, 0644);
-MODULE_PARM_DESC(autorecal, "enable recalibration in the driver");
-
 /*
  * When the touchpad gets ultra-sensitive, one can keep their finger 1/2"
  * above the pad and still have it send packets.  This causes a jump cursor
@@ -427,22 +424,8 @@ static void hgpk_recalib_work(struct work_struct *work)
 
 static int hgpk_register(struct psmouse *psmouse)
 {
-        struct input_dev *dev = psmouse->dev;
         int err;
 
-        /* unset the things that psmouse-base sets which we don't have */
-        __clear_bit(BTN_MIDDLE, dev->keybit);
-
-        /* set the things we do have */
-        __set_bit(EV_KEY, dev->evbit);
-        __set_bit(EV_REL, dev->evbit);
-
-        __set_bit(REL_X, dev->relbit);
-        __set_bit(REL_Y, dev->relbit);
-
-        __set_bit(BTN_LEFT, dev->keybit);
-        __set_bit(BTN_RIGHT, dev->keybit);
-
         /* register handlers */
         psmouse->protocol_handler = hgpk_process_byte;
         psmouse->poll = hgpk_poll;
diff --git a/drivers/input/mouse/lifebook.c b/drivers/input/mouse/lifebook.c
index 82811558ec33..c31ad11df6bb 100644
--- a/drivers/input/mouse/lifebook.c
+++ b/drivers/input/mouse/lifebook.c
@@ -16,6 +16,7 @@
 #include <linux/serio.h>
 #include <linux/libps2.h>
 #include <linux/dmi.h>
+#include <linux/slab.h>
 
 #include "psmouse.h"
 #include "lifebook.h"
@@ -25,11 +26,13 @@ struct lifebook_data {
         char phys[32];
 };
 
+static bool lifebook_present;
+
 static const char *desired_serio_phys;
 
-static int lifebook_set_serio_phys(const struct dmi_system_id *d)
+static int lifebook_limit_serio3(const struct dmi_system_id *d)
 {
-        desired_serio_phys = d->driver_data;
+        desired_serio_phys = "isa0060/serio3";
         return 0;
 }
 
@@ -41,53 +44,58 @@ static int lifebook_set_6byte_proto(const struct dmi_system_id *d)
         return 0;
 }
 
-static const struct dmi_system_id lifebook_dmi_table[] = {
+static const struct dmi_system_id __initconst lifebook_dmi_table[] = {
         {
-                .ident = "FLORA-ie 55mi",
+                /* FLORA-ie 55mi */
                 .matches = {
                         DMI_MATCH(DMI_PRODUCT_NAME, "FLORA-ie 55mi"),
                 },
         },
         {
-                .ident = "LifeBook B",
+                /* LifeBook B */
+                .matches = {
+                        DMI_MATCH(DMI_PRODUCT_NAME, "Lifebook B Series"),
+                },
+        },
+        {
+                /* LifeBook B */
                 .matches = {
                         DMI_MATCH(DMI_PRODUCT_NAME, "LifeBook B Series"),
                 },
         },
         {
-                .ident = "Lifebook B",
+                /* Lifebook B */
                 .matches = {
                         DMI_MATCH(DMI_PRODUCT_NAME, "LIFEBOOK B Series"),
                 },
         },
         {
-                .ident = "Lifebook B-2130",
+                /* Lifebook B-2130 */
                 .matches = {
                         DMI_MATCH(DMI_BOARD_NAME, "ZEPHYR"),
                 },
         },
         {
-                .ident = "Lifebook B213x/B2150",
+                /* Lifebook B213x/B2150 */
                 .matches = {
                         DMI_MATCH(DMI_PRODUCT_NAME, "LifeBook B2131/B2133/B2150"),
                 },
         },
         {
-                .ident = "Zephyr",
+                /* Zephyr */
                 .matches = {
                         DMI_MATCH(DMI_PRODUCT_NAME, "ZEPHYR"),
                 },
         },
         {
-                .ident = "CF-18",
+                /* Panasonic CF-18 */
                 .matches = {
                         DMI_MATCH(DMI_PRODUCT_NAME, "CF-18"),
                 },
-                .callback = lifebook_set_serio_phys,
-                .driver_data = "isa0060/serio3",
+                .callback = lifebook_limit_serio3,
         },
         {
-                .ident = "Panasonic CF-28",
+                /* Panasonic CF-28 */
                 .matches = {
                         DMI_MATCH(DMI_SYS_VENDOR, "Matsushita"),
                         DMI_MATCH(DMI_PRODUCT_NAME, "CF-28"),
@@ -95,7 +103,7 @@ static const struct dmi_system_id lifebook_dmi_table[] = {
                 .callback = lifebook_set_6byte_proto,
         },
         {
-                .ident = "Panasonic CF-29",
+                /* Panasonic CF-29 */
                 .matches = {
                         DMI_MATCH(DMI_SYS_VENDOR, "Matsushita"),
                         DMI_MATCH(DMI_PRODUCT_NAME, "CF-29"),
@@ -103,14 +111,14 @@ static const struct dmi_system_id lifebook_dmi_table[] = {
                 .callback = lifebook_set_6byte_proto,
         },
         {
-                .ident = "CF-72",
+                /* Panasonic CF-72 */
                 .matches = {
                         DMI_MATCH(DMI_PRODUCT_NAME, "CF-72"),
                 },
                 .callback = lifebook_set_6byte_proto,
         },
         {
-                .ident = "Lifebook B142",
+                /* Lifebook B142 */
                 .matches = {
                         DMI_MATCH(DMI_PRODUCT_NAME, "LifeBook B142"),
                 },
@@ -118,6 +126,11 @@ static const struct dmi_system_id lifebook_dmi_table[] = {
         { }
 };
 
+void __init lifebook_module_init(void)
+{
+        lifebook_present = dmi_check_system(lifebook_dmi_table);
+}
+
 static psmouse_ret_t lifebook_process_byte(struct psmouse *psmouse)
 {
         struct lifebook_data *priv = psmouse->private;
@@ -198,10 +211,10 @@ static int lifebook_absolute_mode(struct psmouse *psmouse)
                 return -1;
 
         /*
-           Enable absolute output -- ps2_command fails always but if
-           you leave this call out the touchsreen will never send
-           absolute coordinates
-        */
+         * Enable absolute output -- ps2_command fails always but if
+         * you leave this call out the touchsreen will never send
+         * absolute coordinates
+         */
         param = lifebook_use_6byte_proto ? 0x08 : 0x07;
         ps2_command(ps2dev, &param, PSMOUSE_CMD_SETRES);
 
@@ -243,7 +256,7 @@ static void lifebook_disconnect(struct psmouse *psmouse)
 
 int lifebook_detect(struct psmouse *psmouse, bool set_properties)
 {
-        if (!dmi_check_system(lifebook_dmi_table))
+        if (!lifebook_present)
                 return -1;
 
         if (desired_serio_phys &&
@@ -283,8 +296,8 @@ static int lifebook_create_relative_device(struct psmouse *psmouse)
 
         dev2->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_REL);
         dev2->relbit[BIT_WORD(REL_X)] = BIT_MASK(REL_X) | BIT_MASK(REL_Y);
-        dev2->keybit[BIT_WORD(BTN_LEFT)] = BIT_MASK(BTN_LEFT) |
-                BIT_MASK(BTN_RIGHT);
+        dev2->keybit[BIT_WORD(BTN_LEFT)] =
+                                BIT_MASK(BTN_LEFT) | BIT_MASK(BTN_RIGHT);
 
         error = input_register_device(priv->dev2);
         if (error)
@@ -309,6 +322,7 @@ int lifebook_init(struct psmouse *psmouse)
 
         dev1->evbit[0] = BIT_MASK(EV_ABS) | BIT_MASK(EV_KEY);
         dev1->relbit[0] = 0;
+        dev1->keybit[BIT_WORD(BTN_MOUSE)] = 0;
         dev1->keybit[BIT_WORD(BTN_TOUCH)] = BIT_MASK(BTN_TOUCH);
         input_set_abs_params(dev1, ABS_X, 0, max_coord, 0, 0);
         input_set_abs_params(dev1, ABS_Y, 0, max_coord, 0, 0);
diff --git a/drivers/input/mouse/lifebook.h b/drivers/input/mouse/lifebook.h
index 407cb226bc0a..4c4326c6f504 100644
--- a/drivers/input/mouse/lifebook.h
+++ b/drivers/input/mouse/lifebook.h
@@ -12,9 +12,13 @@
 #define _LIFEBOOK_H
 
 #ifdef CONFIG_MOUSE_PS2_LIFEBOOK
+void lifebook_module_init(void);
 int lifebook_detect(struct psmouse *psmouse, bool set_properties);
 int lifebook_init(struct psmouse *psmouse);
 #else
+inline void lifebook_module_init(void)
+{
+}
 inline int lifebook_detect(struct psmouse *psmouse, bool set_properties)
 {
         return -ENOSYS;
diff --git a/drivers/input/mouse/logips2pp.c b/drivers/input/mouse/logips2pp.c
index ab5dc5f5fd83..543c240a85f2 100644
--- a/drivers/input/mouse/logips2pp.c
+++ b/drivers/input/mouse/logips2pp.c
@@ -404,8 +404,8 @@ int ps2pp_init(struct psmouse *psmouse, bool set_properties)
                         }
                 }
 
-                if (buttons < 3)
-                        __clear_bit(BTN_MIDDLE, psmouse->dev->keybit);
+                if (buttons >= 3)
+                        __set_bit(BTN_MIDDLE, psmouse->dev->keybit);
 
                 if (model_info)
                         ps2pp_set_model_properties(psmouse, model_info, use_ps2pp);
diff --git a/drivers/input/mouse/psmouse-base.c b/drivers/input/mouse/psmouse-base.c
index 07c53798301a..a3c97315a473 100644
--- a/drivers/input/mouse/psmouse-base.c
+++ b/drivers/input/mouse/psmouse-base.c
@@ -110,6 +110,7 @@ static struct workqueue_struct *kpsmoused_wq;
 struct psmouse_protocol {
         enum psmouse_type type;
         bool maxproto;
+        bool ignore_parity; /* Protocol should ignore parity errors from KBC */
         const char *name;
         const char *alias;
         int (*detect)(struct psmouse *, bool);
@@ -288,7 +289,9 @@ static irqreturn_t psmouse_interrupt(struct serio *serio,
         if (psmouse->state == PSMOUSE_IGNORE)
                 goto out;
 
-        if (flags & (SERIO_PARITY|SERIO_TIMEOUT)) {
+        if (unlikely((flags & SERIO_TIMEOUT) ||
+                     ((flags & SERIO_PARITY) && !psmouse->ignore_parity))) {
+
                 if (psmouse->state == PSMOUSE_ACTIVATED)
                         printk(KERN_WARNING "psmouse.c: bad data from KBC -%s%s\n",
                                 flags & SERIO_TIMEOUT ? " timeout" : "",
@@ -425,6 +428,7 @@ static int genius_detect(struct psmouse *psmouse, bool set_properties)
                 return -1;
 
         if (set_properties) {
+                __set_bit(BTN_MIDDLE, psmouse->dev->keybit);
                 __set_bit(BTN_EXTRA, psmouse->dev->keybit);
                 __set_bit(BTN_SIDE, psmouse->dev->keybit);
                 __set_bit(REL_WHEEL, psmouse->dev->relbit);
@@ -460,8 +464,10 @@ static int intellimouse_detect(struct psmouse *psmouse, bool set_properties)
                 __set_bit(BTN_MIDDLE, psmouse->dev->keybit);
                 __set_bit(REL_WHEEL, psmouse->dev->relbit);
 
-                if (!psmouse->vendor) psmouse->vendor = "Generic";
-                if (!psmouse->name) psmouse->name = "Wheel Mouse";
+                if (!psmouse->vendor)
+                        psmouse->vendor = "Generic";
+                if (!psmouse->name)
+                        psmouse->name = "Wheel Mouse";
                 psmouse->pktsize = 4;
         }
 
@@ -504,8 +510,10 @@ static int im_explorer_detect(struct psmouse *psmouse, bool set_properties)
                 __set_bit(BTN_SIDE, psmouse->dev->keybit);
                 __set_bit(BTN_EXTRA, psmouse->dev->keybit);
 
-                if (!psmouse->vendor) psmouse->vendor = "Generic";
-                if (!psmouse->name) psmouse->name = "Explorer Mouse";
+                if (!psmouse->vendor)
+                        psmouse->vendor = "Generic";
+                if (!psmouse->name)
+                        psmouse->name = "Explorer Mouse";
                 psmouse->pktsize = 4;
         }
 
@@ -536,6 +544,7 @@ static int thinking_detect(struct psmouse *psmouse, bool set_properties)
                 return -1;
 
         if (set_properties) {
+                __set_bit(BTN_MIDDLE, psmouse->dev->keybit);
                 __set_bit(BTN_EXTRA, psmouse->dev->keybit);
 
                 psmouse->vendor = "Kensington";
@@ -551,8 +560,16 @@ static int thinking_detect(struct psmouse *psmouse, bool set_properties)
 static int ps2bare_detect(struct psmouse *psmouse, bool set_properties)
 {
         if (set_properties) {
-                if (!psmouse->vendor) psmouse->vendor = "Generic";
-                if (!psmouse->name) psmouse->name = "Mouse";
+                if (!psmouse->vendor)
+                        psmouse->vendor = "Generic";
+                if (!psmouse->name)
+                        psmouse->name = "Mouse";
+
+/*
+ * We have no way of figuring true number of buttons so let's
+ * assume that the device has 3.
+ */
+                __set_bit(BTN_MIDDLE, psmouse->dev->keybit);
         }
 
         return 0;
@@ -567,6 +584,8 @@ static int cortron_detect(struct psmouse *psmouse, bool set_properties)
         if (set_properties) {
                 psmouse->vendor = "Cortron";
                 psmouse->name = "PS/2 Trackball";
+
+                __set_bit(BTN_MIDDLE, psmouse->dev->keybit);
                 __set_bit(BTN_SIDE, psmouse->dev->keybit);
         }
 
@@ -611,8 +630,15 @@ static int psmouse_extensions(struct psmouse *psmouse,
                 synaptics_hardware = true;
 
                 if (max_proto > PSMOUSE_IMEX) {
-                        if (!set_properties || synaptics_init(psmouse) == 0)
+/*
+ * Try activating protocol, but check if support is enabled first, since
+ * we try detecting Synaptics even when protocol is disabled.
+ */
+                        if (synaptics_supported() &&
+                            (!set_properties || synaptics_init(psmouse) == 0)) {
                                 return PSMOUSE_SYNAPTICS;
+                        }
+
 /*
  * Some Synaptics touchpads can emulate extended protocols (like IMPS/2).
  * Unfortunately Logitech/Genius probes confuse some firmware versions so
@@ -667,19 +693,6 @@ static int psmouse_extensions(struct psmouse *psmouse,
                 max_proto = PSMOUSE_IMEX;
         }
 
-/*
- * Try Finger Sensing Pad
- */
-        if (max_proto > PSMOUSE_IMEX) {
-                if (fsp_detect(psmouse, set_properties) == 0) {
-                        if (!set_properties || fsp_init(psmouse) == 0)
-                                return PSMOUSE_FSP;
-/*
- * Init failed, try basic relative protocols
- */
-                        max_proto = PSMOUSE_IMEX;
-                }
-        }
 
         if (max_proto > PSMOUSE_IMEX) {
                 if (genius_detect(psmouse, set_properties) == 0)
@@ -696,6 +709,21 @@ static int psmouse_extensions(struct psmouse *psmouse,
         }
 
 /*
+ * Try Finger Sensing Pad. We do it here because its probe upsets
+ * Trackpoint devices (causing TP_READ_ID command to time out).
+ */
+        if (max_proto > PSMOUSE_IMEX) {
+                if (fsp_detect(psmouse, set_properties) == 0) {
+                        if (!set_properties || fsp_init(psmouse) == 0)
+                                return PSMOUSE_FSP;
+/*
+ * Init failed, try basic relative protocols
+ */
+                        max_proto = PSMOUSE_IMEX;
+                }
+        }
+
+/*
  * Reset to defaults in case the device got confused by extended
  * protocol probes. Note that we follow up with full reset because
  * some mice put themselves to sleep when they see PSMOUSE_RESET_DIS.
@@ -734,6 +762,7 @@ static const struct psmouse_protocol psmouse_protocols[] = {
                 .name           = "PS/2",
                 .alias          = "bare",
                 .maxproto       = true,
+                .ignore_parity  = true,
                 .detect         = ps2bare_detect,
         },
 #ifdef CONFIG_MOUSE_PS2_LOGIPS2PP
@@ -761,6 +790,7 @@ static const struct psmouse_protocol psmouse_protocols[] = {
                 .name           = "ImPS/2",
                 .alias          = "imps",
                 .maxproto       = true,
+                .ignore_parity  = true,
                 .detect         = intellimouse_detect,
         },
         {
@@ -768,6 +798,7 @@ static const struct psmouse_protocol psmouse_protocols[] = {
                 .name           = "ImExPS/2",
                 .alias          = "exps",
                 .maxproto       = true,
+                .ignore_parity  = true,
                 .detect         = im_explorer_detect,
         },
 #ifdef CONFIG_MOUSE_PS2_SYNAPTICS
@@ -1116,12 +1147,22 @@ static void psmouse_cleanup(struct serio *serio)
                 psmouse_deactivate(parent);
         }
 
-        psmouse_deactivate(psmouse);
+        psmouse_set_state(psmouse, PSMOUSE_INITIALIZING);
+
+        /*
+         * Disable stream mode so cleanup routine can proceed undisturbed.
+         */
+        if (ps2_command(&psmouse->ps2dev, NULL, PSMOUSE_CMD_DISABLE))
+                printk(KERN_WARNING "psmouse.c: Failed to disable mouse on %s\n",
+                        psmouse->ps2dev.serio->phys);
 
         if (psmouse->cleanup)
                 psmouse->cleanup(psmouse);
 
-        psmouse_reset(psmouse);
+/*
+ * Reset the mouse to defaults (bare PS/2 protocol).
+ */
+        ps2_command(&psmouse->ps2dev, NULL, PSMOUSE_CMD_RESET_DIS);
 
 /*
  * Some boxes, such as HP nx7400, get terribly confused if mouse
@@ -1184,15 +1225,17 @@ static void psmouse_disconnect(struct serio *serio)
         mutex_unlock(&psmouse_mutex);
 }
 
-static int psmouse_switch_protocol(struct psmouse *psmouse, const struct psmouse_protocol *proto)
+static int psmouse_switch_protocol(struct psmouse *psmouse,
+                                   const struct psmouse_protocol *proto)
 {
+        const struct psmouse_protocol *selected_proto;
         struct input_dev *input_dev = psmouse->dev;
 
         input_dev->dev.parent = &psmouse->ps2dev.serio->dev;
 
         input_dev->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_REL);
-        input_dev->keybit[BIT_WORD(BTN_MOUSE)] = BIT_MASK(BTN_LEFT) |
-                BIT_MASK(BTN_MIDDLE) | BIT_MASK(BTN_RIGHT);
+        input_dev->keybit[BIT_WORD(BTN_MOUSE)] =
+                                BIT_MASK(BTN_LEFT) | BIT_MASK(BTN_RIGHT);
         input_dev->relbit[0] = BIT_MASK(REL_X) | BIT_MASK(REL_Y);
 
         psmouse->set_rate = psmouse_set_rate;
@@ -1209,10 +1252,14 @@ static int psmouse_switch_protocol(struct psmouse *psmouse, const struct psmouse
                         return -1;
 
                 psmouse->type = proto->type;
-        }
-        else
+                selected_proto = proto;
+        } else {
                 psmouse->type = psmouse_extensions(psmouse,
                                                    psmouse_max_proto, true);
+                selected_proto = psmouse_protocol_by_type(psmouse->type);
+        }
+
+        psmouse->ignore_parity = selected_proto->ignore_parity;
 
         /*
          * If mouse's packet size is 3 there is no point in polling the
@@ -1232,7 +1279,7 @@ static int psmouse_switch_protocol(struct psmouse *psmouse, const struct psmouse
                 psmouse->resync_time = 0;
 
         snprintf(psmouse->devname, sizeof(psmouse->devname), "%s %s %s",
-                 psmouse_protocol_by_type(psmouse->type)->name, psmouse->vendor, psmouse->name);
+                 selected_proto->name, psmouse->vendor, psmouse->name);
 
         input_dev->name = psmouse->devname;
         input_dev->phys = psmouse->phys;
@@ -1347,6 +1394,7 @@ static int psmouse_reconnect(struct serio *serio)
         struct psmouse *psmouse = serio_get_drvdata(serio);
         struct psmouse *parent = NULL;
         struct serio_driver *drv = serio->drv;
+        unsigned char type;
         int rc = -1;
 
         if (!drv || !psmouse) {
@@ -1366,10 +1414,15 @@ static int psmouse_reconnect(struct serio *serio)
         if (psmouse->reconnect) {
                 if (psmouse->reconnect(psmouse))
                         goto out;
-        } else if (psmouse_probe(psmouse) < 0 ||
-                   psmouse->type != psmouse_extensions(psmouse,
-                                                psmouse_max_proto, false)) {
-                goto out;
+        } else {
+                psmouse_reset(psmouse);
+
+                if (psmouse_probe(psmouse) < 0)
+                        goto out;
+
+                type = psmouse_extensions(psmouse, psmouse_max_proto, false);
+                if (psmouse->type != type)
+                        goto out;
         }
 
         /* ok, the device type (and capabilities) match the old one,
@@ -1431,24 +1484,10 @@ ssize_t psmouse_attr_show_helper(struct device *dev, struct device_attribute *de
         struct serio *serio = to_serio_port(dev);
         struct psmouse_attribute *attr = to_psmouse_attr(devattr);
         struct psmouse *psmouse;
-        int retval;
-
-        retval = serio_pin_driver(serio);
-        if (retval)
-                return retval;
-
-        if (serio->drv != &psmouse_drv) {
-                retval = -ENODEV;
-                goto out;
-        }
 
         psmouse = serio_get_drvdata(serio);
 
-        retval = attr->show(psmouse, attr->data, buf);
-
-out:
-        serio_unpin_driver(serio);
-        return retval;
+        return attr->show(psmouse, attr->data, buf);
 }
 
 ssize_t psmouse_attr_set_helper(struct device *dev, struct device_attribute *devattr,
@@ -1459,18 +1498,9 @@ ssize_t psmouse_attr_set_helper(struct device *dev, struct device_attribute *dev
         struct psmouse *psmouse, *parent = NULL;
         int retval;
 
-        retval = serio_pin_driver(serio);
-        if (retval)
-                return retval;
-
-        if (serio->drv != &psmouse_drv) {
-                retval = -ENODEV;
-                goto out_unpin;
-        }
-
         retval = mutex_lock_interruptible(&psmouse_mutex);
         if (retval)
-                goto out_unpin;
+                goto out;
 
         psmouse = serio_get_drvdata(serio);
 
@@ -1500,8 +1530,7 @@ ssize_t psmouse_attr_set_helper(struct device *dev, struct device_attribute *dev
 
  out_unlock:
         mutex_unlock(&psmouse_mutex);
- out_unpin:
-        serio_unpin_driver(serio);
+ out:
         return retval;
 }
 
@@ -1563,9 +1592,7 @@ static ssize_t psmouse_attr_set_protocol(struct psmouse *psmouse, void *data, co
                 }
 
                 mutex_unlock(&psmouse_mutex);
-                serio_unpin_driver(serio);
                 serio_unregister_child_port(serio);
-                serio_pin_driver_uninterruptible(serio);
                 mutex_lock(&psmouse_mutex);
 
                 if (serio->drv != &psmouse_drv) {
@@ -1680,6 +1707,9 @@ static int __init psmouse_init(void)
 {
         int err;
 
+        lifebook_module_init();
+        synaptics_module_init();
+
         kpsmoused_wq = create_singlethread_workqueue("kpsmoused");
         if (!kpsmoused_wq) {
                 printk(KERN_ERR "psmouse: failed to create kpsmoused workqueue\n");
diff --git a/drivers/input/mouse/psmouse.h b/drivers/input/mouse/psmouse.h
index e053bdd137ff..593e910bfc7a 100644
--- a/drivers/input/mouse/psmouse.h
+++ b/drivers/input/mouse/psmouse.h
@@ -47,6 +47,7 @@ struct psmouse {
         unsigned char pktcnt;
         unsigned char pktsize;
         unsigned char type;
+        bool ignore_parity;
         bool acks_disable_command;
         unsigned int model;
         unsigned long last;
diff --git a/drivers/input/mouse/pxa930_trkball.c b/drivers/input/mouse/pxa930_trkball.c
index 1e827ad0afbe..943cfec15665 100644
--- a/drivers/input/mouse/pxa930_trkball.c
+++ b/drivers/input/mouse/pxa930_trkball.c
@@ -18,6 +18,7 @@
 #include <linux/platform_device.h>
 #include <linux/delay.h>
 #include <linux/io.h>
+#include <linux/slab.h>
 
 #include <mach/hardware.h>
 #include <mach/pxa930_trkball.h>
diff --git a/drivers/input/mouse/sentelic.c b/drivers/input/mouse/sentelic.c
index f84cbd97c884..1242775fee19 100644
--- a/drivers/input/mouse/sentelic.c
+++ b/drivers/input/mouse/sentelic.c
@@ -2,7 +2,7 @@
  * Finger Sensing Pad PS/2 mouse driver.
  *
  * Copyright (C) 2005-2007 Asia Vital Components Co., Ltd.
- * Copyright (C) 2005-2009 Tai-hwa Liang, Sentelic Corporation.
+ * Copyright (C) 2005-2010 Tai-hwa Liang, Sentelic Corporation.
  *
  *   This program is free software; you can redistribute it and/or
  *   modify it under the terms of the GNU General Public License
@@ -26,6 +26,7 @@
 #include <linux/libps2.h>
 #include <linux/serio.h>
 #include <linux/jiffies.h>
+#include <linux/slab.h>
 
 #include "psmouse.h"
 #include "sentelic.h"
@@ -658,9 +659,9 @@ static psmouse_ret_t fsp_process_byte(struct psmouse *psmouse)
                         if (packet[3] & BIT(1))
                                 button_status |= 0x0f;  /* wheel up */
                         if (packet[3] & BIT(2))
-                                button_status |= BIT(5);/* horizontal left */
+                                button_status |= BIT(4);/* horizontal left */
                         if (packet[3] & BIT(3))
-                                button_status |= BIT(4);/* horizontal right */
+                                button_status |= BIT(5);/* horizontal right */
                         /* push back to packet queue */
                         if (button_status != 0)
                                 packet[3] = button_status;
@@ -836,6 +837,7 @@ int fsp_init(struct psmouse *psmouse)
         priv->flags |= FSPDRV_FLAG_EN_OPC;
 
         /* Set up various supported input event bits */
+        __set_bit(BTN_MIDDLE, psmouse->dev->keybit);
         __set_bit(BTN_BACK, psmouse->dev->keybit);
         __set_bit(BTN_FORWARD, psmouse->dev->keybit);
         __set_bit(REL_WHEEL, psmouse->dev->relbit);
diff --git a/drivers/input/mouse/synaptics.c b/drivers/input/mouse/synaptics.c
index f4a61252bcc9..ebd7a99efeae 100644
--- a/drivers/input/mouse/synaptics.c
+++ b/drivers/input/mouse/synaptics.c
@@ -24,9 +24,11 @@
  */
 
 #include <linux/module.h>
+#include <linux/dmi.h>
 #include <linux/input.h>
 #include <linux/serio.h>
 #include <linux/libps2.h>
+#include <linux/slab.h>
 #include "psmouse.h"
 #include "synaptics.h"
 
@@ -135,7 +137,8 @@ static int synaptics_capability(struct psmouse *psmouse)
         if (synaptics_send_cmd(psmouse, SYN_QUE_CAPABILITIES, cap))
                 return -1;
         priv->capabilities = (cap[0] << 16) | (cap[1] << 8) | cap[2];
-        priv->ext_cap = 0;
+        priv->ext_cap = priv->ext_cap_0c = 0;
+
         if (!SYN_CAP_VALID(priv->capabilities))
                 return -1;
 
@@ -148,7 +151,7 @@ static int synaptics_capability(struct psmouse *psmouse)
         if (SYN_EXT_CAP_REQUESTS(priv->capabilities) >= 1) {
                 if (synaptics_send_cmd(psmouse, SYN_QUE_EXT_CAPAB, cap)) {
                         printk(KERN_ERR "Synaptics claims to have extended capabilities,"
-                               " but I'm not able to read them.");
+                               " but I'm not able to read them.\n");
                 } else {
                         priv->ext_cap = (cap[0] << 16) | (cap[1] << 8) | cap[2];
 
@@ -160,6 +163,16 @@ static int synaptics_capability(struct psmouse *psmouse)
                                 priv->ext_cap &= 0xff0fff;
                 }
         }
+
+        if (SYN_EXT_CAP_REQUESTS(priv->capabilities) >= 4) {
+                if (synaptics_send_cmd(psmouse, SYN_QUE_EXT_CAPAB_0C, cap)) {
+                        printk(KERN_ERR "Synaptics claims to have extended capability 0x0c,"
+                               " but I'm not able to read it.\n");
+                } else {
+                        priv->ext_cap_0c = (cap[0] << 16) | (cap[1] << 8) | cap[2];
+                }
+        }
+
         return 0;
 }
 
@@ -346,7 +359,15 @@ static void synaptics_parse_hw_state(unsigned char buf[], struct synaptics_data
                 hw->left  = (buf[0] & 0x01) ? 1 : 0;
                 hw->right = (buf[0] & 0x02) ? 1 : 0;
 
-                if (SYN_CAP_MIDDLE_BUTTON(priv->capabilities)) {
+                if (SYN_CAP_CLICKPAD(priv->ext_cap_0c)) {
+                        /*
+                         * Clickpad's button is transmitted as middle button,
+                         * however, since it is primary button, we will report
+                         * it as BTN_LEFT.
+                         */
+                        hw->left = ((buf[0] ^ buf[3]) & 0x01) ? 1 : 0;
+
+                } else if (SYN_CAP_MIDDLE_BUTTON(priv->capabilities)) {
                         hw->middle = ((buf[0] ^ buf[3]) & 0x01) ? 1 : 0;
                         if (hw->w == 2)
                                 hw->scroll = (signed char)(buf[1]);
@@ -591,6 +612,12 @@ static void set_input_params(struct input_dev *dev, struct synaptics_data *priv)
 
         dev->absres[ABS_X] = priv->x_res;
         dev->absres[ABS_Y] = priv->y_res;
+
+        if (SYN_CAP_CLICKPAD(priv->ext_cap_0c)) {
+                /* Clickpads report only left button */
+                __clear_bit(BTN_RIGHT, dev->keybit);
+                __clear_bit(BTN_MIDDLE, dev->keybit);
+        }
 }
 
 static void synaptics_disconnect(struct psmouse *psmouse)
@@ -629,25 +656,26 @@ static int synaptics_reconnect(struct psmouse *psmouse)
         return 0;
 }
 
-#if defined(__i386__)
-#include <linux/dmi.h>
-static const struct dmi_system_id toshiba_dmi_table[] = {
+static bool impaired_toshiba_kbc;
+
+static const struct dmi_system_id __initconst toshiba_dmi_table[] = {
+#if defined(CONFIG_DMI) && defined(CONFIG_X86)
         {
-                .ident = "Toshiba Satellite",
+                /* Toshiba Satellite */
                 .matches = {
                         DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"),
                         DMI_MATCH(DMI_PRODUCT_NAME, "Satellite"),
                 },
         },
         {
-                .ident = "Toshiba Dynabook",
+                /* Toshiba Dynabook */
                 .matches = {
                         DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"),
                         DMI_MATCH(DMI_PRODUCT_NAME, "dynabook"),
                 },
         },
         {
-                .ident = "Toshiba Portege M300",
+                /* Toshiba Portege M300 */
                 .matches = {
                         DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"),
                         DMI_MATCH(DMI_PRODUCT_NAME, "PORTEGE M300"),
@@ -655,7 +683,7 @@ static const struct dmi_system_id toshiba_dmi_table[] = {
 
         },
         {
-                .ident = "Toshiba Portege M300",
+                /* Toshiba Portege M300 */
                 .matches = {
                         DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"),
                         DMI_MATCH(DMI_PRODUCT_NAME, "Portable PC"),
@@ -664,8 +692,13 @@ static const struct dmi_system_id toshiba_dmi_table[] = {
 
         },
         { }
-};
 #endif
+};
+
+void __init synaptics_module_init(void)
+{
+        impaired_toshiba_kbc = dmi_check_system(toshiba_dmi_table);
+}
 
 int synaptics_init(struct psmouse *psmouse)
 {
@@ -689,10 +722,10 @@ int synaptics_init(struct psmouse *psmouse)
 
         priv->pkt_type = SYN_MODEL_NEWABS(priv->model_id) ? SYN_NEWABS : SYN_OLDABS;
 
-        printk(KERN_INFO "Synaptics Touchpad, model: %ld, fw: %ld.%ld, id: %#lx, caps: %#lx/%#lx\n",
+        printk(KERN_INFO "Synaptics Touchpad, model: %ld, fw: %ld.%ld, id: %#lx, caps: %#lx/%#lx/%#lx\n",
                 SYN_ID_MODEL(priv->identity),
                 SYN_ID_MAJOR(priv->identity), SYN_ID_MINOR(priv->identity),
-                priv->model_id, priv->capabilities, priv->ext_cap);
+                priv->model_id, priv->capabilities, priv->ext_cap, priv->ext_cap_0c);
 
         set_input_params(psmouse->dev, priv);
 
@@ -718,18 +751,16 @@ int synaptics_init(struct psmouse *psmouse)
         if (SYN_CAP_PASS_THROUGH(priv->capabilities))
                 synaptics_pt_create(psmouse);
 
-#if defined(__i386__)
         /*
          * Toshiba's KBC seems to have trouble handling data from
          * Synaptics as full rate, switch to lower rate which is roughly
          * thye same as rate of standard PS/2 mouse.
          */
-        if (psmouse->rate >= 80 && dmi_check_system(toshiba_dmi_table)) {
+        if (psmouse->rate >= 80 && impaired_toshiba_kbc) {
                 printk(KERN_INFO "synaptics: Toshiba %s detected, limiting rate to 40pps.\n",
                         dmi_get_system_info(DMI_PRODUCT_NAME));
                 psmouse->rate = 40;
         }
-#endif
 
         return 0;
 
@@ -738,12 +769,26 @@ int synaptics_init(struct psmouse *psmouse)
         return -1;
 }
 
+bool synaptics_supported(void)
+{
+        return true;
+}
+
 #else /* CONFIG_MOUSE_PS2_SYNAPTICS */
 
+void __init synaptics_module_init(void)
+{
+}
+
 int synaptics_init(struct psmouse *psmouse)
 {
         return -ENOSYS;
 }
 
+bool synaptics_supported(void)
+{
+        return false;
+}
+
 #endif /* CONFIG_MOUSE_PS2_SYNAPTICS */
 
diff --git a/drivers/input/mouse/synaptics.h b/drivers/input/mouse/synaptics.h
index 871f6fe377f9..ae37c5d162a4 100644
--- a/drivers/input/mouse/synaptics.h
+++ b/drivers/input/mouse/synaptics.h
@@ -18,6 +18,7 @@
 #define SYN_QUE_SERIAL_NUMBER_SUFFIX    0x07
 #define SYN_QUE_RESOLUTION              0x08
 #define SYN_QUE_EXT_CAPAB               0x09
+#define SYN_QUE_EXT_CAPAB_0C            0x0c
 
 /* synatics modes */
 #define SYN_BIT_ABSOLUTE_MODE           (1 << 7)
@@ -48,6 +49,8 @@
 #define SYN_CAP_VALID(c)                ((((c) & 0x00ff00) >> 8) == 0x47)
 #define SYN_EXT_CAP_REQUESTS(c)         (((c) & 0x700000) >> 20)
 #define SYN_CAP_MULTI_BUTTON_NO(ec)     (((ec) & 0x00f000) >> 12)
+#define SYN_CAP_PRODUCT_ID(ec)          (((ec) & 0xff0000) >> 16)
+#define SYN_CAP_CLICKPAD(ex0c)          ((ex0c) & 0x100100)
 
 /* synaptics modes query bits */
 #define SYN_MODE_ABSOLUTE(m)            ((m) & (1 << 7))
@@ -96,6 +99,7 @@ struct synaptics_data {
         unsigned long int model_id;             /* Model-ID */
         unsigned long int capabilities;         /* Capabilities */
         unsigned long int ext_cap;              /* Extended Capabilities */
+        unsigned long int ext_cap_0c;           /* Ext Caps from 0x0c query */
         unsigned long int identity;             /* Identification */
         int x_res;                              /* X resolution in units/mm */
         int y_res;                              /* Y resolution in units/mm */
@@ -105,8 +109,10 @@ struct synaptics_data {
         int scroll;
 };
 
+void synaptics_module_init(void);
 int synaptics_detect(struct psmouse *psmouse, bool set_properties);
 int synaptics_init(struct psmouse *psmouse);
 void synaptics_reset(struct psmouse *psmouse);
+bool synaptics_supported(void);
 
 #endif /* _SYNAPTICS_H */
diff --git a/drivers/input/mouse/synaptics_i2c.c b/drivers/input/mouse/synaptics_i2c.c
index 7283c78044af..8291e7399ffa 100644
--- a/drivers/input/mouse/synaptics_i2c.c
+++ b/drivers/input/mouse/synaptics_i2c.c
@@ -17,6 +17,7 @@
 #include <linux/input.h>
 #include <linux/delay.h>
 #include <linux/workqueue.h>
+#include <linux/slab.h>
 
 #define DRIVER_NAME             "synaptics_i2c"
 /* maximum product id is 15 characters */
@@ -420,8 +421,8 @@ static void synaptics_i2c_check_params(struct synaptics_i2c *touch)
 }
 
 /* Control the Device polling rate / Work Handler sleep time */
-unsigned long synaptics_i2c_adjust_delay(struct synaptics_i2c *touch,
-                                         bool have_data)
+static unsigned long synaptics_i2c_adjust_delay(struct synaptics_i2c *touch,
+                                                bool have_data)
 {
         unsigned long delay, nodata_count_thres;
 
@@ -520,7 +521,7 @@ static void synaptics_i2c_set_input_params(struct synaptics_i2c *touch)
         __set_bit(BTN_LEFT, input->keybit);
 }
 
-struct synaptics_i2c *synaptics_i2c_touch_create(struct i2c_client *client)
+static struct synaptics_i2c *synaptics_i2c_touch_create(struct i2c_client *client)
 {
         struct synaptics_i2c *touch;
 
diff --git a/drivers/input/mouse/touchkit_ps2.c b/drivers/input/mouse/touchkit_ps2.c
index 0308a0faa94d..88121c59c3cc 100644
--- a/drivers/input/mouse/touchkit_ps2.c
+++ b/drivers/input/mouse/touchkit_ps2.c
@@ -26,7 +26,6 @@
  */
 
 #include <linux/kernel.h>
-#include <linux/slab.h>
 
 #include <linux/input.h>
 #include <linux/serio.h>
@@ -86,7 +85,8 @@ int touchkit_ps2_detect(struct psmouse *psmouse, bool set_properties)
 
         if (set_properties) {
                 dev->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_ABS);
-                __set_bit(BTN_TOUCH, dev->keybit);
+                dev->keybit[BIT_WORD(BTN_MOUSE)] = 0;
+                dev->keybit[BIT_WORD(BTN_TOUCH)] = BIT_MASK(BTN_TOUCH);
                 input_set_abs_params(dev, ABS_X, 0, TOUCHKIT_MAX_XC, 0, 0);
                 input_set_abs_params(dev, ABS_Y, 0, TOUCHKIT_MAX_YC, 0, 0);
 
diff --git a/drivers/input/mouse/trackpoint.c b/drivers/input/mouse/trackpoint.c
index e354362f2971..0643e49ca603 100644
--- a/drivers/input/mouse/trackpoint.c
+++ b/drivers/input/mouse/trackpoint.c
@@ -8,6 +8,7 @@
  * Trademarks are the property of their respective owners.
  */
 
+#include <linux/slab.h>
 #include <linux/delay.h>
 #include <linux/serio.h>
 #include <linux/module.h>
@@ -284,7 +285,6 @@ static int trackpoint_reconnect(struct psmouse *psmouse)
 
 int trackpoint_detect(struct psmouse *psmouse, bool set_properties)
 {
-        struct trackpoint_data *priv;
         struct ps2dev *ps2dev = &psmouse->ps2dev;
         unsigned char firmware_id;
         unsigned char button_info;
@@ -301,8 +301,8 @@ int trackpoint_detect(struct psmouse *psmouse, bool set_properties)
                 button_info = 0;
         }
 
-        psmouse->private = priv = kzalloc(sizeof(struct trackpoint_data), GFP_KERNEL);
-        if (!priv)
+        psmouse->private = kzalloc(sizeof(struct trackpoint_data), GFP_KERNEL);
+        if (!psmouse->private)
                 return -1;
 
         psmouse->vendor = "IBM";
@@ -311,7 +311,10 @@ int trackpoint_detect(struct psmouse *psmouse, bool set_properties)
         psmouse->reconnect = trackpoint_reconnect;
         psmouse->disconnect = trackpoint_disconnect;
 
-        trackpoint_defaults(priv);
+        if ((button_info & 0x0f) >= 3)
+                __set_bit(BTN_MIDDLE, psmouse->dev->keybit);
+
+        trackpoint_defaults(psmouse->private);
         trackpoint_sync(psmouse);
 
         error = sysfs_create_group(&ps2dev->serio->dev.kobj, &trackpoint_attr_group);
@@ -319,7 +322,8 @@ int trackpoint_detect(struct psmouse *psmouse, bool set_properties)
                 printk(KERN_ERR
                         "trackpoint.c: failed to create sysfs attributes, error: %d\n",
                         error);
-                kfree(priv);
+                kfree(psmouse->private);
+                psmouse->private = NULL;
                 return -1;
         }
 
diff --git a/drivers/input/mouse/vsxxxaa.c b/drivers/input/mouse/vsxxxaa.c
index 70111443678e..bf2c0c80d6cc 100644
--- a/drivers/input/mouse/vsxxxaa.c
+++ b/drivers/input/mouse/vsxxxaa.c
@@ -86,27 +86,28 @@
 
 #define DRIVER_DESC "Driver for DEC VSXXX-AA and -GA mice and VSXXX-AB tablet"
 
-MODULE_AUTHOR ("Jan-Benedict Glaw <jbglaw@lug-owl.de>");
-MODULE_DESCRIPTION (DRIVER_DESC);
-MODULE_LICENSE ("GPL");
+MODULE_AUTHOR("Jan-Benedict Glaw <jbglaw@lug-owl.de>");
+MODULE_DESCRIPTION(DRIVER_DESC);
+MODULE_LICENSE("GPL");
 
 #undef VSXXXAA_DEBUG
 #ifdef VSXXXAA_DEBUG
-#define DBG(x...) printk (x)
+#define DBG(x...) printk(x)
 #else
 #define DBG(x...) do {} while (0)
 #endif
 
 #define VSXXXAA_INTRO_MASK      0x80
 #define VSXXXAA_INTRO_HEAD      0x80
-#define IS_HDR_BYTE(x)          (((x) & VSXXXAA_INTRO_MASK)     \
-                                        == VSXXXAA_INTRO_HEAD)
+#define IS_HDR_BYTE(x)                  \
+        (((x) & VSXXXAA_INTRO_MASK) == VSXXXAA_INTRO_HEAD)
 
 #define VSXXXAA_PACKET_MASK     0xe0
 #define VSXXXAA_PACKET_REL      0x80
 #define VSXXXAA_PACKET_ABS      0xc0
 #define VSXXXAA_PACKET_POR      0xa0
-#define MATCH_PACKET_TYPE(data, type)   (((data) & VSXXXAA_PACKET_MASK) == (type))
+#define MATCH_PACKET_TYPE(data, type)   \
+        (((data) & VSXXXAA_PACKET_MASK) == (type))
 
 
 
@@ -123,52 +124,50 @@ struct vsxxxaa {
         char phys[32];
 };
 
-static void
-vsxxxaa_drop_bytes (struct vsxxxaa *mouse, int num)
+static void vsxxxaa_drop_bytes(struct vsxxxaa *mouse, int num)
 {
-        if (num >= mouse->count)
+        if (num >= mouse->count) {
                 mouse->count = 0;
-        else {
-                memmove (mouse->buf, mouse->buf + num - 1, BUFLEN - num);
+        } else {
+                memmove(mouse->buf, mouse->buf + num - 1, BUFLEN - num);
                 mouse->count -= num;
         }
 }
 
-static void
-vsxxxaa_queue_byte (struct vsxxxaa *mouse, unsigned char byte)
+static void vsxxxaa_queue_byte(struct vsxxxaa *mouse, unsigned char byte)
 {
         if (mouse->count == BUFLEN) {
-                printk (KERN_ERR "%s on %s: Dropping a byte of full buffer.\n",
-                                mouse->name, mouse->phys);
-                vsxxxaa_drop_bytes (mouse, 1);
+                printk(KERN_ERR "%s on %s: Dropping a byte of full buffer.\n",
+                        mouse->name, mouse->phys);
+                vsxxxaa_drop_bytes(mouse, 1);
         }
-        DBG (KERN_INFO "Queueing byte 0x%02x\n", byte);
+
+        DBG(KERN_INFO "Queueing byte 0x%02x\n", byte);
 
         mouse->buf[mouse->count++] = byte;
 }
 
-static void
-vsxxxaa_detection_done (struct vsxxxaa *mouse)
+static void vsxxxaa_detection_done(struct vsxxxaa *mouse)
 {
         switch (mouse->type) {
-                case 0x02:
-                        strlcpy (mouse->name, "DEC VSXXX-AA/-GA mouse",
-                                 sizeof (mouse->name));
-                        break;
-
-                case 0x04:
-                        strlcpy (mouse->name, "DEC VSXXX-AB digitizer",
-                                 sizeof (mouse->name));
-                        break;
-
-                default:
-                        snprintf (mouse->name, sizeof (mouse->name),
-                                  "unknown DEC pointer device (type = 0x%02x)",
-                                  mouse->type);
-                        break;
+        case 0x02:
+                strlcpy(mouse->name, "DEC VSXXX-AA/-GA mouse",
+                        sizeof(mouse->name));
+                break;
+
+        case 0x04:
+                strlcpy(mouse->name, "DEC VSXXX-AB digitizer",
+                        sizeof(mouse->name));
+                break;
+
+        default:
+                snprintf(mouse->name, sizeof(mouse->name),
+                         "unknown DEC pointer device (type = 0x%02x)",
+                         mouse->type);
+                break;
         }
 
-        printk (KERN_INFO
+        printk(KERN_INFO
                 "Found %s version 0x%02x from country 0x%02x on port %s\n",
                 mouse->name, mouse->version, mouse->country, mouse->phys);
 }
@@ -176,42 +175,38 @@ vsxxxaa_detection_done (struct vsxxxaa *mouse)
 /*
  * Returns number of bytes to be dropped, 0 if packet is okay.
  */
-static int
-vsxxxaa_check_packet (struct vsxxxaa *mouse, int packet_len)
+static int vsxxxaa_check_packet(struct vsxxxaa *mouse, int packet_len)
 {
         int i;
 
         /* First byte must be a header byte */
-        if (!IS_HDR_BYTE (mouse->buf[0])) {
-                DBG ("vsck: len=%d, 1st=0x%02x\n", packet_len, mouse->buf[0]);
+        if (!IS_HDR_BYTE(mouse->buf[0])) {
+                DBG("vsck: len=%d, 1st=0x%02x\n", packet_len, mouse->buf[0]);
                 return 1;
         }
 
         /* Check all following bytes */
-        if (packet_len > 1) {
-                for (i = 1; i < packet_len; i++) {
-                        if (IS_HDR_BYTE (mouse->buf[i])) {
-                                printk (KERN_ERR "Need to drop %d bytes "
-                                                "of a broken packet.\n",
-                                                i - 1);
-                                DBG (KERN_INFO "check: len=%d, b[%d]=0x%02x\n",
-                                                packet_len, i, mouse->buf[i]);
-                                return i - 1;
-                        }
+        for (i = 1; i < packet_len; i++) {
+                if (IS_HDR_BYTE(mouse->buf[i])) {
+                        printk(KERN_ERR
+                                "Need to drop %d bytes of a broken packet.\n",
+                                i - 1);
+                        DBG(KERN_INFO "check: len=%d, b[%d]=0x%02x\n",
+                            packet_len, i, mouse->buf[i]);
+                        return i - 1;
                 }
         }
 
         return 0;
 }
 
-static __inline__ int
-vsxxxaa_smells_like_packet (struct vsxxxaa *mouse, unsigned char type, size_t len)
+static inline int vsxxxaa_smells_like_packet(struct vsxxxaa *mouse,
+                                             unsigned char type, size_t len)
 {
-        return (mouse->count >= len) && MATCH_PACKET_TYPE (mouse->buf[0], type);
+        return mouse->count >= len && MATCH_PACKET_TYPE(mouse->buf[0], type);
 }
 
-static void
-vsxxxaa_handle_REL_packet (struct vsxxxaa *mouse)
+static void vsxxxaa_handle_REL_packet(struct vsxxxaa *mouse)
 {
         struct input_dev *dev = mouse->dev;
         unsigned char *buf = mouse->buf;
@@ -232,43 +227,42 @@ vsxxxaa_handle_REL_packet (struct vsxxxaa *mouse)
          * 0, bit 4 of byte 0 is direction.
          */
         dx = buf[1] & 0x7f;
-        dx *= ((buf[0] >> 4) & 0x01)? 1: -1;
+        dx *= ((buf[0] >> 4) & 0x01) ? 1 : -1;
 
         /*
          * Low 7 bit of byte 2 are abs(dy), bit 7 is
          * 0, bit 3 of byte 0 is direction.
          */
         dy = buf[2] & 0x7f;
-        dy *= ((buf[0] >> 3) & 0x01)? -1: 1;
+        dy *= ((buf[0] >> 3) & 0x01) ? -1 : 1;
 
         /*
          * Get button state. It's the low three bits
          * (for three buttons) of byte 0.
          */
-        left    = (buf[0] & 0x04)? 1: 0;
-        middle  = (buf[0] & 0x02)? 1: 0;
-        right   = (buf[0] & 0x01)? 1: 0;
+        left    = buf[0] & 0x04;
+        middle  = buf[0] & 0x02;
+        right   = buf[0] & 0x01;
 
-        vsxxxaa_drop_bytes (mouse, 3);
+        vsxxxaa_drop_bytes(mouse, 3);
 
-        DBG (KERN_INFO "%s on %s: dx=%d, dy=%d, buttons=%s%s%s\n",
-                        mouse->name, mouse->phys, dx, dy,
-                        left? "L": "l", middle? "M": "m", right? "R": "r");
+        DBG(KERN_INFO "%s on %s: dx=%d, dy=%d, buttons=%s%s%s\n",
+            mouse->name, mouse->phys, dx, dy,
+            left ? "L" : "l", middle ? "M" : "m", right ? "R" : "r");
 
         /*
          * Report what we've found so far...
          */
-        input_report_key (dev, BTN_LEFT, left);
-        input_report_key (dev, BTN_MIDDLE, middle);
-        input_report_key (dev, BTN_RIGHT, right);
-        input_report_key (dev, BTN_TOUCH, 0);
-        input_report_rel (dev, REL_X, dx);
-        input_report_rel (dev, REL_Y, dy);
-        input_sync (dev);
+        input_report_key(dev, BTN_LEFT, left);
+        input_report_key(dev, BTN_MIDDLE, middle);
+        input_report_key(dev, BTN_RIGHT, right);
+        input_report_key(dev, BTN_TOUCH, 0);
+        input_report_rel(dev, REL_X, dx);
+        input_report_rel(dev, REL_Y, dy);
+        input_sync(dev);
 }
 
-static void
-vsxxxaa_handle_ABS_packet (struct vsxxxaa *mouse)
+static void vsxxxaa_handle_ABS_packet(struct vsxxxaa *mouse)
 {
         struct input_dev *dev = mouse->dev;
         unsigned char *buf = mouse->buf;
@@ -296,32 +290,31 @@ vsxxxaa_handle_ABS_packet (struct vsxxxaa *mouse)
         /*
          * Get button state. It's bits <4..1> of byte 0.
          */
-        left    = (buf[0] & 0x02)? 1: 0;
-        middle  = (buf[0] & 0x04)? 1: 0;
-        right   = (buf[0] & 0x08)? 1: 0;
-        touch   = (buf[0] & 0x10)? 1: 0;
+        left    = buf[0] & 0x02;
+        middle  = buf[0] & 0x04;
+        right   = buf[0] & 0x08;
+        touch   = buf[0] & 0x10;
 
-        vsxxxaa_drop_bytes (mouse, 5);
+        vsxxxaa_drop_bytes(mouse, 5);
 
-        DBG (KERN_INFO "%s on %s: x=%d, y=%d, buttons=%s%s%s%s\n",
-                        mouse->name, mouse->phys, x, y,
-                        left? "L": "l", middle? "M": "m",
-                        right? "R": "r", touch? "T": "t");
+        DBG(KERN_INFO "%s on %s: x=%d, y=%d, buttons=%s%s%s%s\n",
+            mouse->name, mouse->phys, x, y,
+            left ? "L" : "l", middle ? "M" : "m",
+            right ? "R" : "r", touch ? "T" : "t");
 
         /*
          * Report what we've found so far...
          */
-        input_report_key (dev, BTN_LEFT, left);
-        input_report_key (dev, BTN_MIDDLE, middle);
-        input_report_key (dev, BTN_RIGHT, right);
-        input_report_key (dev, BTN_TOUCH, touch);
-        input_report_abs (dev, ABS_X, x);
-        input_report_abs (dev, ABS_Y, y);
-        input_sync (dev);
+        input_report_key(dev, BTN_LEFT, left);
+        input_report_key(dev, BTN_MIDDLE, middle);
+        input_report_key(dev, BTN_RIGHT, right);
+        input_report_key(dev, BTN_TOUCH, touch);
+        input_report_abs(dev, ABS_X, x);
+        input_report_abs(dev, ABS_Y, y);
+        input_sync(dev);
 }
 
-static void
-vsxxxaa_handle_POR_packet (struct vsxxxaa *mouse)
+static void vsxxxaa_handle_POR_packet(struct vsxxxaa *mouse)
 {
         struct input_dev *dev = mouse->dev;
         unsigned char *buf = mouse->buf;
@@ -356,24 +349,24 @@ vsxxxaa_handle_POR_packet (struct vsxxxaa *mouse)
          * (for three buttons) of byte 0. Maybe even the bit <3>
          * has some meaning if a tablet is attached.
          */
-        left    = (buf[0] & 0x04)? 1: 0;
-        middle  = (buf[0] & 0x02)? 1: 0;
-        right   = (buf[0] & 0x01)? 1: 0;
+        left    = buf[0] & 0x04;
+        middle  = buf[0] & 0x02;
+        right   = buf[0] & 0x01;
 
-        vsxxxaa_drop_bytes (mouse, 4);
-        vsxxxaa_detection_done (mouse);
+        vsxxxaa_drop_bytes(mouse, 4);
+        vsxxxaa_detection_done(mouse);
 
         if (error <= 0x1f) {
                 /* No (serious) error. Report buttons */
-                input_report_key (dev, BTN_LEFT, left);
-                input_report_key (dev, BTN_MIDDLE, middle);
-                input_report_key (dev, BTN_RIGHT, right);
-                input_report_key (dev, BTN_TOUCH, 0);
-                input_sync (dev);
+                input_report_key(dev, BTN_LEFT, left);
+                input_report_key(dev, BTN_MIDDLE, middle);
+                input_report_key(dev, BTN_RIGHT, right);
+                input_report_key(dev, BTN_TOUCH, 0);
+                input_sync(dev);
 
                 if (error != 0)
-                        printk (KERN_INFO "Your %s on %s reports error=0x%02x\n",
-                                        mouse->name, mouse->phys, error);
+                        printk(KERN_INFO "Your %s on %s reports error=0x%02x\n",
+                                mouse->name, mouse->phys, error);
 
         }
 
@@ -381,18 +374,18 @@ vsxxxaa_handle_POR_packet (struct vsxxxaa *mouse)
          * If the mouse was hot-plugged, we need to force differential mode
          * now... However, give it a second to recover from it's reset.
          */
-        printk (KERN_NOTICE "%s on %s: Forceing standard packet format, "
-                        "incremental streaming mode and 72 samples/sec\n",
-                        mouse->name, mouse->phys);
-        serio_write (mouse->serio, 'S');        /* Standard format */
-        mdelay (50);
-        serio_write (mouse->serio, 'R');        /* Incremental */
-        mdelay (50);
-        serio_write (mouse->serio, 'L');        /* 72 samples/sec */
+        printk(KERN_NOTICE
+                "%s on %s: Forcing standard packet format, "
+                "incremental streaming mode and 72 samples/sec\n",
+                mouse->name, mouse->phys);
+        serio_write(mouse->serio, 'S'); /* Standard format */
+        mdelay(50);
+        serio_write(mouse->serio, 'R'); /* Incremental */
+        mdelay(50);
+        serio_write(mouse->serio, 'L'); /* 72 samples/sec */
 }
 
-static void
-vsxxxaa_parse_buffer (struct vsxxxaa *mouse)
+static void vsxxxaa_parse_buffer(struct vsxxxaa *mouse)
 {
         unsigned char *buf = mouse->buf;
         int stray_bytes;
@@ -409,122 +402,107 @@ vsxxxaa_parse_buffer (struct vsxxxaa *mouse)
                  * activity on the mouse.
                  */
                 while (mouse->count > 0 && !IS_HDR_BYTE(buf[0])) {
-                        printk (KERN_ERR "%s on %s: Dropping a byte to regain "
-                                        "sync with mouse data stream...\n",
-                                        mouse->name, mouse->phys);
-                        vsxxxaa_drop_bytes (mouse, 1);
+                        printk(KERN_ERR "%s on %s: Dropping a byte to regain "
+                                "sync with mouse data stream...\n",
+                                mouse->name, mouse->phys);
+                        vsxxxaa_drop_bytes(mouse, 1);
                 }
 
                 /*
                  * Check for packets we know about.
                  */
 
-                if (vsxxxaa_smells_like_packet (mouse, VSXXXAA_PACKET_REL, 3)) {
+                if (vsxxxaa_smells_like_packet(mouse, VSXXXAA_PACKET_REL, 3)) {
                         /* Check for broken packet */
-                        stray_bytes = vsxxxaa_check_packet (mouse, 3);
-                        if (stray_bytes > 0) {
-                                printk (KERN_ERR "Dropping %d bytes now...\n",
-                                                stray_bytes);
-                                vsxxxaa_drop_bytes (mouse, stray_bytes);
-                                continue;
-                        }
-
-                        vsxxxaa_handle_REL_packet (mouse);
-                        continue; /* More to parse? */
-                }
+                        stray_bytes = vsxxxaa_check_packet(mouse, 3);
+                        if (!stray_bytes)
+                                vsxxxaa_handle_REL_packet(mouse);
 
-                if (vsxxxaa_smells_like_packet (mouse, VSXXXAA_PACKET_ABS, 5)) {
+                } else if (vsxxxaa_smells_like_packet(mouse,
+                                                      VSXXXAA_PACKET_ABS, 5)) {
                         /* Check for broken packet */
-                        stray_bytes = vsxxxaa_check_packet (mouse, 5);
-                        if (stray_bytes > 0) {
-                                printk (KERN_ERR "Dropping %d bytes now...\n",
-                                                stray_bytes);
-                                vsxxxaa_drop_bytes (mouse, stray_bytes);
-                                continue;
-                        }
-
-                        vsxxxaa_handle_ABS_packet (mouse);
-                        continue; /* More to parse? */
-                }
+                        stray_bytes = vsxxxaa_check_packet(mouse, 5);
+                        if (!stray_bytes)
+                                vsxxxaa_handle_ABS_packet(mouse);
 
-                if (vsxxxaa_smells_like_packet (mouse, VSXXXAA_PACKET_POR, 4)) {
+                } else if (vsxxxaa_smells_like_packet(mouse,
+                                                      VSXXXAA_PACKET_POR, 4)) {
                         /* Check for broken packet */
-                        stray_bytes = vsxxxaa_check_packet (mouse, 4);
-                        if (stray_bytes > 0) {
-                                printk (KERN_ERR "Dropping %d bytes now...\n",
-                                                stray_bytes);
-                                vsxxxaa_drop_bytes (mouse, stray_bytes);
-                                continue;
-                        }
-
-                        vsxxxaa_handle_POR_packet (mouse);
-                        continue; /* More to parse? */
+                        stray_bytes = vsxxxaa_check_packet(mouse, 4);
+                        if (!stray_bytes)
+                                vsxxxaa_handle_POR_packet(mouse);
+
+                } else {
+                        break; /* No REL, ABS or POR packet found */
+                }
+
+                if (stray_bytes > 0) {
+                        printk(KERN_ERR "Dropping %d bytes now...\n",
+                                stray_bytes);
+                        vsxxxaa_drop_bytes(mouse, stray_bytes);
                 }
 
-                break; /* No REL, ABS or POR packet found */
         } while (1);
 }
 
-static irqreturn_t
-vsxxxaa_interrupt (struct serio *serio, unsigned char data, unsigned int flags)
+static irqreturn_t vsxxxaa_interrupt(struct serio *serio,
+                                     unsigned char data, unsigned int flags)
 {
-        struct vsxxxaa *mouse = serio_get_drvdata (serio);
+        struct vsxxxaa *mouse = serio_get_drvdata(serio);
 
-        vsxxxaa_queue_byte (mouse, data);
-        vsxxxaa_parse_buffer (mouse);
+        vsxxxaa_queue_byte(mouse, data);
+        vsxxxaa_parse_buffer(mouse);
 
         return IRQ_HANDLED;
 }
 
-static void
-vsxxxaa_disconnect (struct serio *serio)
+static void vsxxxaa_disconnect(struct serio *serio)
 {
-        struct vsxxxaa *mouse = serio_get_drvdata (serio);
+        struct vsxxxaa *mouse = serio_get_drvdata(serio);
 
-        serio_close (serio);
-        serio_set_drvdata (serio, NULL);
-        input_unregister_device (mouse->dev);
-        kfree (mouse);
+        serio_close(serio);
+        serio_set_drvdata(serio, NULL);
+        input_unregister_device(mouse->dev);
+        kfree(mouse);
 }
 
-static int
-vsxxxaa_connect (struct serio *serio, struct serio_driver *drv)
+static int vsxxxaa_connect(struct serio *serio, struct serio_driver *drv)
 {
         struct vsxxxaa *mouse;
         struct input_dev *input_dev;
         int err = -ENOMEM;
 
-        mouse = kzalloc (sizeof (struct vsxxxaa), GFP_KERNEL);
-        input_dev = input_allocate_device ();
+        mouse = kzalloc(sizeof(struct vsxxxaa), GFP_KERNEL);
+        input_dev = input_allocate_device();
         if (!mouse || !input_dev)
                 goto fail1;
 
         mouse->dev = input_dev;
         mouse->serio = serio;
-        strlcat (mouse->name, "DEC VSXXX-AA/-GA mouse or VSXXX-AB digitizer",
-                 sizeof (mouse->name));
-        snprintf (mouse->phys, sizeof (mouse->phys), "%s/input0", serio->phys);
+        strlcat(mouse->name, "DEC VSXXX-AA/-GA mouse or VSXXX-AB digitizer",
+                 sizeof(mouse->name));
+        snprintf(mouse->phys, sizeof(mouse->phys), "%s/input0", serio->phys);
 
         input_dev->name = mouse->name;
         input_dev->phys = mouse->phys;
         input_dev->id.bustype = BUS_RS232;
         input_dev->dev.parent = &serio->dev;
 
-        set_bit (EV_KEY, input_dev->evbit);             /* We have buttons */
-        set_bit (EV_REL, input_dev->evbit);
-        set_bit (EV_ABS, input_dev->evbit);
-        set_bit (BTN_LEFT, input_dev->keybit);          /* We have 3 buttons */
-        set_bit (BTN_MIDDLE, input_dev->keybit);
-        set_bit (BTN_RIGHT, input_dev->keybit);
-        set_bit (BTN_TOUCH, input_dev->keybit);         /* ...and Tablet */
-        set_bit (REL_X, input_dev->relbit);
-        set_bit (REL_Y, input_dev->relbit);
-        input_set_abs_params (input_dev, ABS_X, 0, 1023, 0, 0);
-        input_set_abs_params (input_dev, ABS_Y, 0, 1023, 0, 0);
-
-        serio_set_drvdata (serio, mouse);
-
-        err = serio_open (serio, drv);
+        __set_bit(EV_KEY, input_dev->evbit);            /* We have buttons */
+        __set_bit(EV_REL, input_dev->evbit);
+        __set_bit(EV_ABS, input_dev->evbit);
+        __set_bit(BTN_LEFT, input_dev->keybit);         /* We have 3 buttons */
+        __set_bit(BTN_MIDDLE, input_dev->keybit);
+        __set_bit(BTN_RIGHT, input_dev->keybit);
+        __set_bit(BTN_TOUCH, input_dev->keybit);        /* ...and Tablet */
+        __set_bit(REL_X, input_dev->relbit);
+        __set_bit(REL_Y, input_dev->relbit);
+        input_set_abs_params(input_dev, ABS_X, 0, 1023, 0, 0);
+        input_set_abs_params(input_dev, ABS_Y, 0, 1023, 0, 0);
+
+        serio_set_drvdata(serio, mouse);
+
+        err = serio_open(serio, drv);
         if (err)
                 goto fail2;
 
@@ -532,18 +510,18 @@ vsxxxaa_connect (struct serio *serio, struct serio_driver *drv)
          * Request selftest. Standard packet format and differential
          * mode will be requested after the device ID'ed successfully.
          */
-        serio_write (serio, 'T'); /* Test */
+        serio_write(serio, 'T'); /* Test */
 
-        err = input_register_device (input_dev);
+        err = input_register_device(input_dev);
         if (err)
                 goto fail3;
 
         return 0;
 
- fail3: serio_close (serio);
- fail2: serio_set_drvdata (serio, NULL);
- fail1: input_free_device (input_dev);
-        kfree (mouse);
+ fail3: serio_close(serio);
+ fail2: serio_set_drvdata(serio, NULL);
+ fail1: input_free_device(input_dev);
+        kfree(mouse);
         return err;
 }
 
@@ -570,18 +548,16 @@ static struct serio_driver vsxxxaa_drv = {
         .disconnect     = vsxxxaa_disconnect,
 };
 
-static int __init
-vsxxxaa_init (void)
+static int __init vsxxxaa_init(void)
 {
         return serio_register_driver(&vsxxxaa_drv);
 }
 
-static void __exit
-vsxxxaa_exit (void)
+static void __exit vsxxxaa_exit(void)
 {
         serio_unregister_driver(&vsxxxaa_drv);
 }
 
-module_init (vsxxxaa_init);
-module_exit (vsxxxaa_exit);
+module_init(vsxxxaa_init);
+module_exit(vsxxxaa_exit);