diff options
Diffstat (limited to 'drivers/input/mouse/sermouse.c')
-rw-r--r-- | drivers/input/mouse/sermouse.c | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/drivers/input/mouse/sermouse.c b/drivers/input/mouse/sermouse.c index 680b32353884..2a272c5daf08 100644 --- a/drivers/input/mouse/sermouse.c +++ b/drivers/input/mouse/sermouse.c | |||
@@ -61,13 +61,11 @@ struct sermouse { | |||
61 | * second, which is as good as a PS/2 or USB mouse. | 61 | * second, which is as good as a PS/2 or USB mouse. |
62 | */ | 62 | */ |
63 | 63 | ||
64 | static void sermouse_process_msc(struct sermouse *sermouse, signed char data, struct pt_regs *regs) | 64 | static void sermouse_process_msc(struct sermouse *sermouse, signed char data) |
65 | { | 65 | { |
66 | struct input_dev *dev = sermouse->dev; | 66 | struct input_dev *dev = sermouse->dev; |
67 | signed char *buf = sermouse->buf; | 67 | signed char *buf = sermouse->buf; |
68 | 68 | ||
69 | input_regs(dev, regs); | ||
70 | |||
71 | switch (sermouse->count) { | 69 | switch (sermouse->count) { |
72 | 70 | ||
73 | case 0: | 71 | case 0: |
@@ -104,15 +102,13 @@ static void sermouse_process_msc(struct sermouse *sermouse, signed char data, st | |||
104 | * standard 3-byte packets and 1200 bps. | 102 | * standard 3-byte packets and 1200 bps. |
105 | */ | 103 | */ |
106 | 104 | ||
107 | static void sermouse_process_ms(struct sermouse *sermouse, signed char data, struct pt_regs *regs) | 105 | static void sermouse_process_ms(struct sermouse *sermouse, signed char data) |
108 | { | 106 | { |
109 | struct input_dev *dev = sermouse->dev; | 107 | struct input_dev *dev = sermouse->dev; |
110 | signed char *buf = sermouse->buf; | 108 | signed char *buf = sermouse->buf; |
111 | 109 | ||
112 | if (data & 0x40) sermouse->count = 0; | 110 | if (data & 0x40) sermouse->count = 0; |
113 | 111 | ||
114 | input_regs(dev, regs); | ||
115 | |||
116 | switch (sermouse->count) { | 112 | switch (sermouse->count) { |
117 | 113 | ||
118 | case 0: | 114 | case 0: |
@@ -206,7 +202,7 @@ static void sermouse_process_ms(struct sermouse *sermouse, signed char data, str | |||
206 | */ | 202 | */ |
207 | 203 | ||
208 | static irqreturn_t sermouse_interrupt(struct serio *serio, | 204 | static irqreturn_t sermouse_interrupt(struct serio *serio, |
209 | unsigned char data, unsigned int flags, struct pt_regs *regs) | 205 | unsigned char data, unsigned int flags) |
210 | { | 206 | { |
211 | struct sermouse *sermouse = serio_get_drvdata(serio); | 207 | struct sermouse *sermouse = serio_get_drvdata(serio); |
212 | 208 | ||
@@ -214,9 +210,9 @@ static irqreturn_t sermouse_interrupt(struct serio *serio, | |||
214 | sermouse->last = jiffies; | 210 | sermouse->last = jiffies; |
215 | 211 | ||
216 | if (sermouse->type > SERIO_SUN) | 212 | if (sermouse->type > SERIO_SUN) |
217 | sermouse_process_ms(sermouse, data, regs); | 213 | sermouse_process_ms(sermouse, data); |
218 | else | 214 | else |
219 | sermouse_process_msc(sermouse, data, regs); | 215 | sermouse_process_msc(sermouse, data); |
220 | return IRQ_HANDLED; | 216 | return IRQ_HANDLED; |
221 | } | 217 | } |
222 | 218 | ||