Input: psmouse - small formatting changes to better follow coding style

Signed-off-by: Dmitry Torokhov <dtor@mail.ru>

diff --git a/drivers/input/mouse/hgpk.c b/drivers/input/mouse/hgpk.c
index 08d66d8..1d2205b 100644 (file)
--- a/drivers/input/mouse/hgpk.c
+++ b/drivers/input/mouse/hgpk.c
@@ -40,8 +40,8 @@
 #include "psmouse.h"
 #include "hgpk.h"
 
-static int tpdebug;
-module_param(tpdebug, int, 0644);
+static bool tpdebug;
+module_param(tpdebug, bool, 0644);
 MODULE_PARM_DESC(tpdebug, "enable debugging, dumping packets to KERN_DEBUG.");
 
 static int recalib_delta = 100;

diff --git a/drivers/input/mouse/logips2pp.c b/drivers/input/mouse/logips2pp.c
index 543c240..c9983ae 100644 (file)
--- a/drivers/input/mouse/logips2pp.c
+++ b/drivers/input/mouse/logips2pp.c
@@ -56,36 +56,36 @@ static psmouse_ret_t ps2pp_process_byte(struct psmouse *psmouse)
                /* Logitech extended packet */
                switch ((packet[1] >> 4) | (packet[0] & 0x30)) {
 
-                       case 0x0d: /* Mouse extra info */
+               case 0x0d: /* Mouse extra info */
 
-                               input_report_rel(dev, packet[2] & 0x80 ? REL_HWHEEL : REL_WHEEL,
-                                       (int) (packet[2] & 8) - (int) (packet[2] & 7));
-                               input_report_key(dev, BTN_SIDE, (packet[2] >> 4) & 1);
-                               input_report_key(dev, BTN_EXTRA, (packet[2] >> 5) & 1);
+                       input_report_rel(dev, packet[2] & 0x80 ? REL_HWHEEL : REL_WHEEL,
+                               (int) (packet[2] & 8) - (int) (packet[2] & 7));
+                       input_report_key(dev, BTN_SIDE, (packet[2] >> 4) & 1);
+                       input_report_key(dev, BTN_EXTRA, (packet[2] >> 5) & 1);
 
-                               break;
+                       break;
 
-                       case 0x0e: /* buttons 4, 5, 6, 7, 8, 9, 10 info */
+               case 0x0e: /* buttons 4, 5, 6, 7, 8, 9, 10 info */
 
-                               input_report_key(dev, BTN_SIDE, (packet[2]) & 1);
-                               input_report_key(dev, BTN_EXTRA, (packet[2] >> 1) & 1);
-                               input_report_key(dev, BTN_BACK, (packet[2] >> 3) & 1);
-                               input_report_key(dev, BTN_FORWARD, (packet[2] >> 4) & 1);
-                               input_report_key(dev, BTN_TASK, (packet[2] >> 2) & 1);
+                       input_report_key(dev, BTN_SIDE, (packet[2]) & 1);
+                       input_report_key(dev, BTN_EXTRA, (packet[2] >> 1) & 1);
+                       input_report_key(dev, BTN_BACK, (packet[2] >> 3) & 1);
+                       input_report_key(dev, BTN_FORWARD, (packet[2] >> 4) & 1);
+                       input_report_key(dev, BTN_TASK, (packet[2] >> 2) & 1);
 
-                               break;
+                       break;
 
-                       case 0x0f: /* TouchPad extra info */
+               case 0x0f: /* TouchPad extra info */
 
-                               input_report_rel(dev, packet[2] & 0x08 ? REL_HWHEEL : REL_WHEEL,
-                                       (int) ((packet[2] >> 4) & 8) - (int) ((packet[2] >> 4) & 7));
-                               packet[0] = packet[2] | 0x08;
-                               break;
+                       input_report_rel(dev, packet[2] & 0x08 ? REL_HWHEEL : REL_WHEEL,
+                               (int) ((packet[2] >> 4) & 8) - (int) ((packet[2] >> 4) & 7));
+                       packet[0] = packet[2] | 0x08;
+                       break;
 
 #ifdef DEBUG
-                       default:
-                               printk(KERN_WARNING "psmouse.c: Received PS2++ packet #%x, but don't know how to handle.\n",
-                                       (packet[1] >> 4) | (packet[0] & 0x30));
+               default:
+                       printk(KERN_WARNING "psmouse.c: Received PS2++ packet #%x, but don't know how to handle.\n",
+                               (packet[1] >> 4) | (packet[0] & 0x30));
 #endif
                }
        } else {
@@ -250,7 +250,6 @@ static const struct ps2pp_info *get_model_info(unsigned char model)
                if (model == ps2pp_list[i].model)
                        return &ps2pp_list[i];
 
-       printk(KERN_WARNING "logips2pp: Detected unknown logitech mouse model %d\n", model);
        return NULL;
 }
 
@@ -285,31 +284,32 @@ static void ps2pp_set_model_properties(struct psmouse *psmouse,
                __set_bit(REL_HWHEEL, input_dev->relbit);
 
        switch (model_info->kind) {
-               case PS2PP_KIND_WHEEL:
-                       psmouse->name = "Wheel Mouse";
-                       break;
-
-               case PS2PP_KIND_MX:
-                       psmouse->name = "MX Mouse";
-                       break;
 
-               case PS2PP_KIND_TP3:
-                       psmouse->name = "TouchPad 3";
-                       break;
-
-               case PS2PP_KIND_TRACKMAN:
-                       psmouse->name = "TrackMan";
-                       break;
-
-               default:
-                       /*
-                        * Set name to "Mouse" only when using PS2++,
-                        * otherwise let other protocols define suitable
-                        * name
-                        */
-                       if (using_ps2pp)
-                               psmouse->name = "Mouse";
-                       break;
+       case PS2PP_KIND_WHEEL:
+               psmouse->name = "Wheel Mouse";
+               break;
+
+       case PS2PP_KIND_MX:
+               psmouse->name = "MX Mouse";
+               break;
+
+       case PS2PP_KIND_TP3:
+               psmouse->name = "TouchPad 3";
+               break;
+
+       case PS2PP_KIND_TRACKMAN:
+               psmouse->name = "TrackMan";
+               break;
+
+       default:
+               /*
+                * Set name to "Mouse" only when using PS2++,
+                * otherwise let other protocols define suitable
+                * name
+                */
+               if (using_ps2pp)
+                       psmouse->name = "Mouse";
+               break;
        }
 }
 
@@ -343,7 +343,8 @@ int ps2pp_init(struct psmouse *psmouse, bool set_properties)
        if (!model || !buttons)
                return -1;
 
-       if ((model_info = get_model_info(model)) != NULL) {
+       model_info = get_model_info(model);
+       if (model_info) {
 
 /*
  * Do Logitech PS2++ / PS2T++ magic init.
@@ -379,6 +380,9 @@ int ps2pp_init(struct psmouse *psmouse, bool set_properties)
                                use_ps2pp = true;
                        }
                }
+
+       } else {
+               printk(KERN_WARNING "logips2pp: Detected unknown logitech mouse model %d\n", model);
        }
 
        if (set_properties) {

diff --git a/drivers/input/mouse/psmouse-base.c b/drivers/input/mouse/psmouse-base.c
index a3c9731..979c502 100644 (file)
--- a/drivers/input/mouse/psmouse-base.c
+++ b/drivers/input/mouse/psmouse-base.c
@@ -147,18 +147,18 @@ static psmouse_ret_t psmouse_process_byte(struct psmouse *psmouse)
 
        if (psmouse->type == PSMOUSE_IMEX) {
                switch (packet[3] & 0xC0) {
-                       case 0x80: /* vertical scroll on IntelliMouse Explorer 4.0 */
-                               input_report_rel(dev, REL_WHEEL, (int) (packet[3] & 32) - (int) (packet[3] & 31));
-                               break;
-                       case 0x40: /* horizontal scroll on IntelliMouse Explorer 4.0 */
-                               input_report_rel(dev, REL_HWHEEL, (int) (packet[3] & 32) - (int) (packet[3] & 31));
-                               break;
-                       case 0x00:
-                       case 0xC0:
-                               input_report_rel(dev, REL_WHEEL, (int) (packet[3] & 8) - (int) (packet[3] & 7));
-                               input_report_key(dev, BTN_SIDE, (packet[3] >> 4) & 1);
-                               input_report_key(dev, BTN_EXTRA, (packet[3] >> 5) & 1);
-                               break;
+               case 0x80: /* vertical scroll on IntelliMouse Explorer 4.0 */
+                       input_report_rel(dev, REL_WHEEL, (int) (packet[3] & 32) - (int) (packet[3] & 31));
+                       break;
+               case 0x40: /* horizontal scroll on IntelliMouse Explorer 4.0 */
+                       input_report_rel(dev, REL_HWHEEL, (int) (packet[3] & 32) - (int) (packet[3] & 31));
+                       break;
+               case 0x00:
+               case 0xC0:
+                       input_report_rel(dev, REL_WHEEL, (int) (packet[3] & 8) - (int) (packet[3] & 7));
+                       input_report_key(dev, BTN_SIDE, (packet[3] >> 4) & 1);
+                       input_report_key(dev, BTN_EXTRA, (packet[3] >> 5) & 1);
+                       break;
                }
        }
 
@@ -247,31 +247,31 @@ static int psmouse_handle_byte(struct psmouse *psmouse)
        psmouse_ret_t rc = psmouse->protocol_handler(psmouse);
 
        switch (rc) {
-               case PSMOUSE_BAD_DATA:
-                       if (psmouse->state == PSMOUSE_ACTIVATED) {
-                               printk(KERN_WARNING "psmouse.c: %s at %s lost sync at byte %d\n",
-                                       psmouse->name, psmouse->phys, psmouse->pktcnt);
-                               if (++psmouse->out_of_sync_cnt == psmouse->resetafter) {
-                                       __psmouse_set_state(psmouse, PSMOUSE_IGNORE);
-                                       printk(KERN_NOTICE "psmouse.c: issuing reconnect request\n");
-                                       serio_reconnect(psmouse->ps2dev.serio);
-                                       return -1;
-                               }
-                       }
-                       psmouse->pktcnt = 0;
-                       break;
-
-               case PSMOUSE_FULL_PACKET:
-                       psmouse->pktcnt = 0;
-                       if (psmouse->out_of_sync_cnt) {
-                               psmouse->out_of_sync_cnt = 0;
-                               printk(KERN_NOTICE "psmouse.c: %s at %s - driver resynched.\n",
-                                       psmouse->name, psmouse->phys);
+       case PSMOUSE_BAD_DATA:
+               if (psmouse->state == PSMOUSE_ACTIVATED) {
+                       printk(KERN_WARNING "psmouse.c: %s at %s lost sync at byte %d\n",
+                               psmouse->name, psmouse->phys, psmouse->pktcnt);
+                       if (++psmouse->out_of_sync_cnt == psmouse->resetafter) {
+                               __psmouse_set_state(psmouse, PSMOUSE_IGNORE);
+                               printk(KERN_NOTICE "psmouse.c: issuing reconnect request\n");
+                               serio_reconnect(psmouse->ps2dev.serio);
+                               return -1;
                        }
-                       break;
+               }
+               psmouse->pktcnt = 0;
+               break;
+
+       case PSMOUSE_FULL_PACKET:
+               psmouse->pktcnt = 0;
+               if (psmouse->out_of_sync_cnt) {
+                       psmouse->out_of_sync_cnt = 0;
+                       printk(KERN_NOTICE "psmouse.c: %s at %s - driver resynched.\n",
+                               psmouse->name, psmouse->phys);
+               }
+               break;
 
-               case PSMOUSE_GOOD_DATA:
-                       break;
+       case PSMOUSE_GOOD_DATA:
+               break;
        }
        return 0;
 }
@@ -1245,7 +1245,7 @@ static int psmouse_switch_protocol(struct psmouse *psmouse,
        psmouse->pktsize = 3;
 
        if (proto && (proto->detect || proto->init)) {
-               if (proto->detect && proto->detect(psmouse, 1) < 0)
+               if (proto->detect && proto->detect(psmouse, true) < 0)
                        return -1;
 
                if (proto->init && proto->init(psmouse) < 0)

diff --git a/drivers/input/mouse/synaptics.c b/drivers/input/mouse/synaptics.c
index 52bb1de..40cea33 100644 (file)
--- a/drivers/input/mouse/synaptics.c
+++ b/drivers/input/mouse/synaptics.c
@@ -532,19 +532,20 @@ static int synaptics_validate_byte(unsigned char packet[], int idx, unsigned cha
                return 0;
 
        switch (pkt_type) {
-               case SYN_NEWABS:
-               case SYN_NEWABS_RELAXED:
-                       return (packet[idx] & newabs_rel_mask[idx]) == newabs_rslt[idx];
 
-               case SYN_NEWABS_STRICT:
-                       return (packet[idx] & newabs_mask[idx]) == newabs_rslt[idx];
+       case SYN_NEWABS:
+       case SYN_NEWABS_RELAXED:
+               return (packet[idx] & newabs_rel_mask[idx]) == newabs_rslt[idx];
 
-               case SYN_OLDABS:
-                       return (packet[idx] & oldabs_mask[idx]) == oldabs_rslt[idx];
+       case SYN_NEWABS_STRICT:
+               return (packet[idx] & newabs_mask[idx]) == newabs_rslt[idx];
 
-               default:
-                       printk(KERN_ERR "synaptics: unknown packet type %d\n", pkt_type);
-                       return 0;
+       case SYN_OLDABS:
+               return (packet[idx] & oldabs_mask[idx]) == oldabs_rslt[idx];
+
+       default:
+               printk(KERN_ERR "synaptics: unknown packet type %d\n", pkt_type);
+               return 0;
        }
 }