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/input/mouse/rpcmouse.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/input/mouse/rpcmouse.c')
-rw-r--r-- | drivers/input/mouse/rpcmouse.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/input/mouse/rpcmouse.c b/drivers/input/mouse/rpcmouse.c index 872b30bf7aa..ea046856961 100644 --- a/drivers/input/mouse/rpcmouse.c +++ b/drivers/input/mouse/rpcmouse.c | |||
@@ -36,7 +36,7 @@ MODULE_LICENSE("GPL"); | |||
36 | static short rpcmouse_lastx, rpcmouse_lasty; | 36 | static short rpcmouse_lastx, rpcmouse_lasty; |
37 | static struct input_dev *rpcmouse_dev; | 37 | static struct input_dev *rpcmouse_dev; |
38 | 38 | ||
39 | static irqreturn_t rpcmouse_irq(int irq, void *dev_id, struct pt_regs *regs) | 39 | static irqreturn_t rpcmouse_irq(int irq, void *dev_id) |
40 | { | 40 | { |
41 | struct input_dev *dev = dev_id; | 41 | struct input_dev *dev = dev_id; |
42 | short x, y, dx, dy, b; | 42 | short x, y, dx, dy, b; |
@@ -51,8 +51,6 @@ static irqreturn_t rpcmouse_irq(int irq, void *dev_id, struct pt_regs *regs) | |||
51 | rpcmouse_lastx = x; | 51 | rpcmouse_lastx = x; |
52 | rpcmouse_lasty = y; | 52 | rpcmouse_lasty = y; |
53 | 53 | ||
54 | input_regs(dev, regs); | ||
55 | |||
56 | input_report_rel(dev, REL_X, dx); | 54 | input_report_rel(dev, REL_X, dx); |
57 | input_report_rel(dev, REL_Y, -dy); | 55 | input_report_rel(dev, REL_Y, -dy); |
58 | 56 | ||