Commit b6884d28 authored by Dmitry Torokhov's avatar Dmitry Torokhov

Psmouse: whitespace fixes

parent d8bf0bcd
...@@ -163,14 +163,14 @@ static irqreturn_t psmouse_interrupt(struct serio *serio, ...@@ -163,14 +163,14 @@ static irqreturn_t psmouse_interrupt(struct serio *serio,
psmouse->name, psmouse->phys, psmouse->pktcnt); psmouse->name, psmouse->phys, psmouse->pktcnt);
psmouse->pktcnt = 0; psmouse->pktcnt = 0;
} }
psmouse->last = jiffies; psmouse->last = jiffies;
psmouse->packet[psmouse->pktcnt++] = data; psmouse->packet[psmouse->pktcnt++] = data;
if (psmouse->packet[0] == PSMOUSE_RET_BAT) { if (psmouse->packet[0] == PSMOUSE_RET_BAT) {
if (psmouse->pktcnt == 1) if (psmouse->pktcnt == 1)
goto out; goto out;
if (psmouse->pktcnt == 2) { if (psmouse->pktcnt == 2) {
if (psmouse->packet[1] == PSMOUSE_RET_ID) { if (psmouse->packet[1] == PSMOUSE_RET_ID) {
psmouse->state = PSMOUSE_IGNORE; psmouse->state = PSMOUSE_IGNORE;
...@@ -258,7 +258,7 @@ int psmouse_command(struct psmouse *psmouse, unsigned char *param, int command) ...@@ -258,7 +258,7 @@ int psmouse_command(struct psmouse *psmouse, unsigned char *param, int command)
return (psmouse->cmdcnt = 0) - 1; return (psmouse->cmdcnt = 0) - 1;
while (psmouse->cmdcnt && timeout--) { while (psmouse->cmdcnt && timeout--) {
if (psmouse->cmdcnt == 1 && command == PSMOUSE_CMD_RESET_BAT && if (psmouse->cmdcnt == 1 && command == PSMOUSE_CMD_RESET_BAT &&
timeout > 100000) /* do not run in a endless loop */ timeout > 100000) /* do not run in a endless loop */
timeout = 100000; /* 1 sec */ timeout = 100000; /* 1 sec */
...@@ -497,7 +497,7 @@ static void psmouse_set_rate(struct psmouse *psmouse) ...@@ -497,7 +497,7 @@ static void psmouse_set_rate(struct psmouse *psmouse)
static void psmouse_initialize(struct psmouse *psmouse) static void psmouse_initialize(struct psmouse *psmouse)
{ {
unsigned char param[2]; unsigned char param[2];
/* /*
* We set the mouse report rate, resolution and scaling. * We set the mouse report rate, resolution and scaling.
*/ */
...@@ -571,7 +571,7 @@ static void psmouse_disconnect(struct serio *serio) ...@@ -571,7 +571,7 @@ static void psmouse_disconnect(struct serio *serio)
static void psmouse_connect(struct serio *serio, struct serio_dev *dev) static void psmouse_connect(struct serio *serio, struct serio_dev *dev)
{ {
struct psmouse *psmouse; struct psmouse *psmouse;
if ((serio->type & SERIO_TYPE) != SERIO_8042 && if ((serio->type & SERIO_TYPE) != SERIO_8042 &&
(serio->type & SERIO_TYPE) != SERIO_PS_PSTHRU) (serio->type & SERIO_TYPE) != SERIO_PS_PSTHRU)
return; return;
...@@ -603,7 +603,7 @@ static void psmouse_connect(struct serio *serio, struct serio_dev *dev) ...@@ -603,7 +603,7 @@ static void psmouse_connect(struct serio *serio, struct serio_dev *dev)
serio->private = NULL; serio->private = NULL;
return; return;
} }
sprintf(psmouse->devname, "%s %s %s", sprintf(psmouse->devname, "%s %s %s",
psmouse_protocols[psmouse->type], psmouse->vendor, psmouse->name); psmouse_protocols[psmouse->type], psmouse->vendor, psmouse->name);
sprintf(psmouse->phys, "%s/input0", sprintf(psmouse->phys, "%s/input0",
...@@ -617,7 +617,7 @@ static void psmouse_connect(struct serio *serio, struct serio_dev *dev) ...@@ -617,7 +617,7 @@ static void psmouse_connect(struct serio *serio, struct serio_dev *dev)
psmouse->dev.id.version = psmouse->model; psmouse->dev.id.version = psmouse->model;
input_register_device(&psmouse->dev); input_register_device(&psmouse->dev);
printk(KERN_INFO "input: %s on %s\n", psmouse->devname, serio->phys); printk(KERN_INFO "input: %s on %s\n", psmouse->devname, serio->phys);
psmouse_initialize(psmouse); psmouse_initialize(psmouse);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment