diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-05 19:32:01 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-05 19:32:01 -0400 |
commit | 44aefd2706bb6f5b65ba2c38cd89e7609e2b43d3 (patch) | |
tree | 93824f573767da634fbc82c388b6d33cc454212b /drivers/usb/input/itmtouch.c | |
parent | c1a26e7d40fb814716950122353a1a556844286b (diff) | |
parent | 7d12e780e003f93433d49ce78cfedf4b4c52adc5 (diff) |
Merge git://git.infradead.org/~dhowells/irq-2.6
* git://git.infradead.org/~dhowells/irq-2.6:
IRQ: Maintain regs pointer globally rather than passing to IRQ handlers
IRQ: Typedef the IRQ handler function type
IRQ: Typedef the IRQ flow handler function type
Diffstat (limited to 'drivers/usb/input/itmtouch.c')
-rw-r--r-- | drivers/usb/input/itmtouch.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/usb/input/itmtouch.c b/drivers/usb/input/itmtouch.c index f3e3080de5b5..aac968aab860 100644 --- a/drivers/usb/input/itmtouch.c +++ b/drivers/usb/input/itmtouch.c | |||
@@ -80,7 +80,7 @@ static struct usb_device_id itmtouch_ids [] = { | |||
80 | { } | 80 | { } |
81 | }; | 81 | }; |
82 | 82 | ||
83 | static void itmtouch_irq(struct urb *urb, struct pt_regs *regs) | 83 | static void itmtouch_irq(struct urb *urb) |
84 | { | 84 | { |
85 | struct itmtouch_dev *itmtouch = urb->context; | 85 | struct itmtouch_dev *itmtouch = urb->context; |
86 | unsigned char *data = urb->transfer_buffer; | 86 | unsigned char *data = urb->transfer_buffer; |
@@ -109,8 +109,6 @@ static void itmtouch_irq(struct urb *urb, struct pt_regs *regs) | |||
109 | goto exit; | 109 | goto exit; |
110 | } | 110 | } |
111 | 111 | ||
112 | input_regs(dev, regs); | ||
113 | |||
114 | /* if pressure has been released, then don't report X/Y */ | 112 | /* if pressure has been released, then don't report X/Y */ |
115 | if (!(data[7] & 0x20)) { | 113 | if (!(data[7] & 0x20)) { |
116 | input_report_abs(dev, ABS_X, (data[0] & 0x1F) << 7 | (data[3] & 0x7F)); | 114 | input_report_abs(dev, ABS_X, (data[0] & 0x1F) << 7 | (data[3] & 0x7F)); |