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/logibm.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/logibm.c')
-rw-r--r-- | drivers/input/mouse/logibm.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/input/mouse/logibm.c b/drivers/input/mouse/logibm.c index 9c7ce38806d7..8e9c2f3d69a8 100644 --- a/drivers/input/mouse/logibm.c +++ b/drivers/input/mouse/logibm.c | |||
@@ -79,7 +79,7 @@ __obsolete_setup("logibm_irq="); | |||
79 | 79 | ||
80 | static struct input_dev *logibm_dev; | 80 | static struct input_dev *logibm_dev; |
81 | 81 | ||
82 | static irqreturn_t logibm_interrupt(int irq, void *dev_id, struct pt_regs *regs) | 82 | static irqreturn_t logibm_interrupt(int irq, void *dev_id) |
83 | { | 83 | { |
84 | char dx, dy; | 84 | char dx, dy; |
85 | unsigned char buttons; | 85 | unsigned char buttons; |
@@ -95,7 +95,6 @@ static irqreturn_t logibm_interrupt(int irq, void *dev_id, struct pt_regs *regs) | |||
95 | dy |= (buttons & 0xf) << 4; | 95 | dy |= (buttons & 0xf) << 4; |
96 | buttons = ~buttons >> 5; | 96 | buttons = ~buttons >> 5; |
97 | 97 | ||
98 | input_regs(logibm_dev, regs); | ||
99 | input_report_rel(logibm_dev, REL_X, dx); | 98 | input_report_rel(logibm_dev, REL_X, dx); |
100 | input_report_rel(logibm_dev, REL_Y, dy); | 99 | input_report_rel(logibm_dev, REL_Y, dy); |
101 | input_report_key(logibm_dev, BTN_RIGHT, buttons & 1); | 100 | input_report_key(logibm_dev, BTN_RIGHT, buttons & 1); |