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/keyboard/stowaway.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/keyboard/stowaway.c')
-rw-r--r-- | drivers/input/keyboard/stowaway.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/input/keyboard/stowaway.c b/drivers/input/keyboard/stowaway.c index 04c54c57f25c..e60937d17b1c 100644 --- a/drivers/input/keyboard/stowaway.c +++ b/drivers/input/keyboard/stowaway.c | |||
@@ -71,13 +71,12 @@ struct skbd { | |||
71 | }; | 71 | }; |
72 | 72 | ||
73 | static irqreturn_t skbd_interrupt(struct serio *serio, unsigned char data, | 73 | static irqreturn_t skbd_interrupt(struct serio *serio, unsigned char data, |
74 | unsigned int flags, struct pt_regs *regs) | 74 | unsigned int flags) |
75 | { | 75 | { |
76 | struct skbd *skbd = serio_get_drvdata(serio); | 76 | struct skbd *skbd = serio_get_drvdata(serio); |
77 | struct input_dev *dev = skbd->dev; | 77 | struct input_dev *dev = skbd->dev; |
78 | 78 | ||
79 | if (skbd->keycode[data & SKBD_KEY_MASK]) { | 79 | if (skbd->keycode[data & SKBD_KEY_MASK]) { |
80 | input_regs(dev, regs); | ||
81 | input_report_key(dev, skbd->keycode[data & SKBD_KEY_MASK], | 80 | input_report_key(dev, skbd->keycode[data & SKBD_KEY_MASK], |
82 | !(data & SKBD_RELEASE)); | 81 | !(data & SKBD_RELEASE)); |
83 | input_sync(dev); | 82 | input_sync(dev); |