diff options
Diffstat (limited to 'drivers/input/mouse/psmouse-base.c')
-rw-r--r-- | drivers/input/mouse/psmouse-base.c | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/drivers/input/mouse/psmouse-base.c b/drivers/input/mouse/psmouse-base.c index 9fb7eb6b0f71..6f9b2c7cc9c2 100644 --- a/drivers/input/mouse/psmouse-base.c +++ b/drivers/input/mouse/psmouse-base.c | |||
@@ -124,7 +124,7 @@ struct psmouse_protocol { | |||
124 | * relevant events to the input module once full packet has arrived. | 124 | * relevant events to the input module once full packet has arrived. |
125 | */ | 125 | */ |
126 | 126 | ||
127 | static psmouse_ret_t psmouse_process_byte(struct psmouse *psmouse, struct pt_regs *regs) | 127 | static psmouse_ret_t psmouse_process_byte(struct psmouse *psmouse) |
128 | { | 128 | { |
129 | struct input_dev *dev = psmouse->dev; | 129 | struct input_dev *dev = psmouse->dev; |
130 | unsigned char *packet = psmouse->packet; | 130 | unsigned char *packet = psmouse->packet; |
@@ -136,8 +136,6 @@ static psmouse_ret_t psmouse_process_byte(struct psmouse *psmouse, struct pt_reg | |||
136 | * Full packet accumulated, process it | 136 | * Full packet accumulated, process it |
137 | */ | 137 | */ |
138 | 138 | ||
139 | input_regs(dev, regs); | ||
140 | |||
141 | /* | 139 | /* |
142 | * Scroll wheel on IntelliMice, scroll buttons on NetMice | 140 | * Scroll wheel on IntelliMice, scroll buttons on NetMice |
143 | */ | 141 | */ |
@@ -231,9 +229,9 @@ static void psmouse_set_state(struct psmouse *psmouse, enum psmouse_state new_st | |||
231 | * by calling corresponding protocol handler. | 229 | * by calling corresponding protocol handler. |
232 | */ | 230 | */ |
233 | 231 | ||
234 | static int psmouse_handle_byte(struct psmouse *psmouse, struct pt_regs *regs) | 232 | static int psmouse_handle_byte(struct psmouse *psmouse) |
235 | { | 233 | { |
236 | psmouse_ret_t rc = psmouse->protocol_handler(psmouse, regs); | 234 | psmouse_ret_t rc = psmouse->protocol_handler(psmouse); |
237 | 235 | ||
238 | switch (rc) { | 236 | switch (rc) { |
239 | case PSMOUSE_BAD_DATA: | 237 | case PSMOUSE_BAD_DATA: |
@@ -271,7 +269,7 @@ static int psmouse_handle_byte(struct psmouse *psmouse, struct pt_regs *regs) | |||
271 | */ | 269 | */ |
272 | 270 | ||
273 | static irqreturn_t psmouse_interrupt(struct serio *serio, | 271 | static irqreturn_t psmouse_interrupt(struct serio *serio, |
274 | unsigned char data, unsigned int flags, struct pt_regs *regs) | 272 | unsigned char data, unsigned int flags) |
275 | { | 273 | { |
276 | struct psmouse *psmouse = serio_get_drvdata(serio); | 274 | struct psmouse *psmouse = serio_get_drvdata(serio); |
277 | 275 | ||
@@ -327,7 +325,7 @@ static irqreturn_t psmouse_interrupt(struct serio *serio, | |||
327 | * Not a new device, try processing first byte normally | 325 | * Not a new device, try processing first byte normally |
328 | */ | 326 | */ |
329 | psmouse->pktcnt = 1; | 327 | psmouse->pktcnt = 1; |
330 | if (psmouse_handle_byte(psmouse, regs)) | 328 | if (psmouse_handle_byte(psmouse)) |
331 | goto out; | 329 | goto out; |
332 | 330 | ||
333 | psmouse->packet[psmouse->pktcnt++] = data; | 331 | psmouse->packet[psmouse->pktcnt++] = data; |
@@ -346,7 +344,7 @@ static irqreturn_t psmouse_interrupt(struct serio *serio, | |||
346 | } | 344 | } |
347 | 345 | ||
348 | psmouse->last = jiffies; | 346 | psmouse->last = jiffies; |
349 | psmouse_handle_byte(psmouse, regs); | 347 | psmouse_handle_byte(psmouse); |
350 | 348 | ||
351 | out: | 349 | out: |
352 | return IRQ_HANDLED; | 350 | return IRQ_HANDLED; |
@@ -940,7 +938,7 @@ static void psmouse_resync(void *p) | |||
940 | psmouse_set_state(psmouse, PSMOUSE_CMD_MODE); | 938 | psmouse_set_state(psmouse, PSMOUSE_CMD_MODE); |
941 | for (i = 0; i < psmouse->pktsize; i++) { | 939 | for (i = 0; i < psmouse->pktsize; i++) { |
942 | psmouse->pktcnt++; | 940 | psmouse->pktcnt++; |
943 | rc = psmouse->protocol_handler(psmouse, NULL); | 941 | rc = psmouse->protocol_handler(psmouse); |
944 | if (rc != PSMOUSE_GOOD_DATA) | 942 | if (rc != PSMOUSE_GOOD_DATA) |
945 | break; | 943 | break; |
946 | } | 944 | } |