diff options
Diffstat (limited to 'drivers/usb/input/ati_remote2.c')
-rw-r--r-- | drivers/usb/input/ati_remote2.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/drivers/usb/input/ati_remote2.c b/drivers/usb/input/ati_remote2.c index ea71de81ca6b..f982a2b4a7f9 100644 --- a/drivers/usb/input/ati_remote2.c +++ b/drivers/usb/input/ati_remote2.c | |||
@@ -142,7 +142,7 @@ static void ati_remote2_close(struct input_dev *idev) | |||
142 | usb_kill_urb(ar2->urb[1]); | 142 | usb_kill_urb(ar2->urb[1]); |
143 | } | 143 | } |
144 | 144 | ||
145 | static void ati_remote2_input_mouse(struct ati_remote2 *ar2, struct pt_regs *regs) | 145 | static void ati_remote2_input_mouse(struct ati_remote2 *ar2) |
146 | { | 146 | { |
147 | struct input_dev *idev = ar2->idev; | 147 | struct input_dev *idev = ar2->idev; |
148 | u8 *data = ar2->buf[0]; | 148 | u8 *data = ar2->buf[0]; |
@@ -157,7 +157,6 @@ static void ati_remote2_input_mouse(struct ati_remote2 *ar2, struct pt_regs *reg | |||
157 | if (!((1 << data[0]) & mode_mask)) | 157 | if (!((1 << data[0]) & mode_mask)) |
158 | return; | 158 | return; |
159 | 159 | ||
160 | input_regs(idev, regs); | ||
161 | input_event(idev, EV_REL, REL_X, (s8) data[1]); | 160 | input_event(idev, EV_REL, REL_X, (s8) data[1]); |
162 | input_event(idev, EV_REL, REL_Y, (s8) data[2]); | 161 | input_event(idev, EV_REL, REL_Y, (s8) data[2]); |
163 | input_sync(idev); | 162 | input_sync(idev); |
@@ -174,7 +173,7 @@ static int ati_remote2_lookup(unsigned int hw_code) | |||
174 | return -1; | 173 | return -1; |
175 | } | 174 | } |
176 | 175 | ||
177 | static void ati_remote2_input_key(struct ati_remote2 *ar2, struct pt_regs *regs) | 176 | static void ati_remote2_input_key(struct ati_remote2 *ar2) |
178 | { | 177 | { |
179 | struct input_dev *idev = ar2->idev; | 178 | struct input_dev *idev = ar2->idev; |
180 | u8 *data = ar2->buf[1]; | 179 | u8 *data = ar2->buf[1]; |
@@ -245,19 +244,18 @@ static void ati_remote2_input_key(struct ati_remote2 *ar2, struct pt_regs *regs) | |||
245 | return; | 244 | return; |
246 | } | 245 | } |
247 | 246 | ||
248 | input_regs(idev, regs); | ||
249 | input_event(idev, EV_KEY, ati_remote2_key_table[index].key_code, data[1]); | 247 | input_event(idev, EV_KEY, ati_remote2_key_table[index].key_code, data[1]); |
250 | input_sync(idev); | 248 | input_sync(idev); |
251 | } | 249 | } |
252 | 250 | ||
253 | static void ati_remote2_complete_mouse(struct urb *urb, struct pt_regs *regs) | 251 | static void ati_remote2_complete_mouse(struct urb *urb) |
254 | { | 252 | { |
255 | struct ati_remote2 *ar2 = urb->context; | 253 | struct ati_remote2 *ar2 = urb->context; |
256 | int r; | 254 | int r; |
257 | 255 | ||
258 | switch (urb->status) { | 256 | switch (urb->status) { |
259 | case 0: | 257 | case 0: |
260 | ati_remote2_input_mouse(ar2, regs); | 258 | ati_remote2_input_mouse(ar2); |
261 | break; | 259 | break; |
262 | case -ENOENT: | 260 | case -ENOENT: |
263 | case -EILSEQ: | 261 | case -EILSEQ: |
@@ -277,14 +275,14 @@ static void ati_remote2_complete_mouse(struct urb *urb, struct pt_regs *regs) | |||
277 | "%s(): usb_submit_urb() = %d\n", __FUNCTION__, r); | 275 | "%s(): usb_submit_urb() = %d\n", __FUNCTION__, r); |
278 | } | 276 | } |
279 | 277 | ||
280 | static void ati_remote2_complete_key(struct urb *urb, struct pt_regs *regs) | 278 | static void ati_remote2_complete_key(struct urb *urb) |
281 | { | 279 | { |
282 | struct ati_remote2 *ar2 = urb->context; | 280 | struct ati_remote2 *ar2 = urb->context; |
283 | int r; | 281 | int r; |
284 | 282 | ||
285 | switch (urb->status) { | 283 | switch (urb->status) { |
286 | case 0: | 284 | case 0: |
287 | ati_remote2_input_key(ar2, regs); | 285 | ati_remote2_input_key(ar2); |
288 | break; | 286 | break; |
289 | case -ENOENT: | 287 | case -ENOENT: |
290 | case -EILSEQ: | 288 | case -EILSEQ: |