diff options
Diffstat (limited to 'drivers/usb/input/xpad.c')
-rw-r--r-- | drivers/usb/input/xpad.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/usb/input/xpad.c b/drivers/usb/input/xpad.c index 9889b1cda05b..cebb6c463bfb 100644 --- a/drivers/usb/input/xpad.c +++ b/drivers/usb/input/xpad.c | |||
@@ -120,12 +120,10 @@ struct usb_xpad { | |||
120 | * http://euc.jp/periphs/xbox-controller.ja.html | 120 | * http://euc.jp/periphs/xbox-controller.ja.html |
121 | */ | 121 | */ |
122 | 122 | ||
123 | static void xpad_process_packet(struct usb_xpad *xpad, u16 cmd, unsigned char *data, struct pt_regs *regs) | 123 | static void xpad_process_packet(struct usb_xpad *xpad, u16 cmd, unsigned char *data) |
124 | { | 124 | { |
125 | struct input_dev *dev = xpad->dev; | 125 | struct input_dev *dev = xpad->dev; |
126 | 126 | ||
127 | input_regs(dev, regs); | ||
128 | |||
129 | /* left stick */ | 127 | /* left stick */ |
130 | input_report_abs(dev, ABS_X, (__s16) (((__s16)data[13] << 8) | data[12])); | 128 | input_report_abs(dev, ABS_X, (__s16) (((__s16)data[13] << 8) | data[12])); |
131 | input_report_abs(dev, ABS_Y, (__s16) (((__s16)data[15] << 8) | data[14])); | 129 | input_report_abs(dev, ABS_Y, (__s16) (((__s16)data[15] << 8) | data[14])); |
@@ -161,7 +159,7 @@ static void xpad_process_packet(struct usb_xpad *xpad, u16 cmd, unsigned char *d | |||
161 | input_sync(dev); | 159 | input_sync(dev); |
162 | } | 160 | } |
163 | 161 | ||
164 | static void xpad_irq_in(struct urb *urb, struct pt_regs *regs) | 162 | static void xpad_irq_in(struct urb *urb) |
165 | { | 163 | { |
166 | struct usb_xpad *xpad = urb->context; | 164 | struct usb_xpad *xpad = urb->context; |
167 | int retval; | 165 | int retval; |
@@ -181,7 +179,7 @@ static void xpad_irq_in(struct urb *urb, struct pt_regs *regs) | |||
181 | goto exit; | 179 | goto exit; |
182 | } | 180 | } |
183 | 181 | ||
184 | xpad_process_packet(xpad, 0, xpad->idata, regs); | 182 | xpad_process_packet(xpad, 0, xpad->idata); |
185 | 183 | ||
186 | exit: | 184 | exit: |
187 | retval = usb_submit_urb (urb, GFP_ATOMIC); | 185 | retval = usb_submit_urb (urb, GFP_ATOMIC); |