diff options
Diffstat (limited to 'drivers/input/keyboard/locomokbd.c')
| -rw-r--r-- | drivers/input/keyboard/locomokbd.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/input/keyboard/locomokbd.c b/drivers/input/keyboard/locomokbd.c index 83906f80ba21..fd33c9cc3272 100644 --- a/drivers/input/keyboard/locomokbd.c +++ b/drivers/input/keyboard/locomokbd.c | |||
| @@ -126,7 +126,7 @@ static inline void locomokbd_reset_col(unsigned long membase, int col) | |||
| 126 | */ | 126 | */ |
| 127 | 127 | ||
| 128 | /* Scan the hardware keyboard and push any changes up through the input layer */ | 128 | /* Scan the hardware keyboard and push any changes up through the input layer */ |
| 129 | static void locomokbd_scankeyboard(struct locomokbd *locomokbd, struct pt_regs *regs) | 129 | static void locomokbd_scankeyboard(struct locomokbd *locomokbd) |
| 130 | { | 130 | { |
| 131 | unsigned int row, col, rowd, scancode; | 131 | unsigned int row, col, rowd, scancode; |
| 132 | unsigned long flags; | 132 | unsigned long flags; |
| @@ -135,8 +135,6 @@ static void locomokbd_scankeyboard(struct locomokbd *locomokbd, struct pt_regs * | |||
| 135 | 135 | ||
| 136 | spin_lock_irqsave(&locomokbd->lock, flags); | 136 | spin_lock_irqsave(&locomokbd->lock, flags); |
| 137 | 137 | ||
| 138 | input_regs(locomokbd->input, regs); | ||
| 139 | |||
| 140 | locomokbd_charge_all(membase); | 138 | locomokbd_charge_all(membase); |
| 141 | 139 | ||
| 142 | num_pressed = 0; | 140 | num_pressed = 0; |
| @@ -171,13 +169,13 @@ static void locomokbd_scankeyboard(struct locomokbd *locomokbd, struct pt_regs * | |||
| 171 | /* | 169 | /* |
| 172 | * LoCoMo keyboard interrupt handler. | 170 | * LoCoMo keyboard interrupt handler. |
| 173 | */ | 171 | */ |
| 174 | static irqreturn_t locomokbd_interrupt(int irq, void *dev_id, struct pt_regs *regs) | 172 | static irqreturn_t locomokbd_interrupt(int irq, void *dev_id) |
| 175 | { | 173 | { |
| 176 | struct locomokbd *locomokbd = dev_id; | 174 | struct locomokbd *locomokbd = dev_id; |
| 177 | /** wait chattering delay **/ | 175 | /** wait chattering delay **/ |
| 178 | udelay(100); | 176 | udelay(100); |
| 179 | 177 | ||
| 180 | locomokbd_scankeyboard(locomokbd, regs); | 178 | locomokbd_scankeyboard(locomokbd); |
| 181 | 179 | ||
| 182 | return IRQ_HANDLED; | 180 | return IRQ_HANDLED; |
| 183 | } | 181 | } |
