diff options
Diffstat (limited to 'drivers/input/keyboard/spitzkbd.c')
-rw-r--r-- | drivers/input/keyboard/spitzkbd.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/drivers/input/keyboard/spitzkbd.c b/drivers/input/keyboard/spitzkbd.c index e385710233f4..8b18c009e3e0 100644 --- a/drivers/input/keyboard/spitzkbd.c +++ b/drivers/input/keyboard/spitzkbd.c | |||
@@ -176,7 +176,7 @@ static inline int spitzkbd_get_row_status(int col) | |||
176 | */ | 176 | */ |
177 | 177 | ||
178 | /* Scan the hardware keyboard and push any changes up through the input layer */ | 178 | /* Scan the hardware keyboard and push any changes up through the input layer */ |
179 | static void spitzkbd_scankeyboard(struct spitzkbd *spitzkbd_data, struct pt_regs *regs) | 179 | static void spitzkbd_scankeyboard(struct spitzkbd *spitzkbd_data) |
180 | { | 180 | { |
181 | unsigned int row, col, rowd; | 181 | unsigned int row, col, rowd; |
182 | unsigned long flags; | 182 | unsigned long flags; |
@@ -187,8 +187,6 @@ static void spitzkbd_scankeyboard(struct spitzkbd *spitzkbd_data, struct pt_regs | |||
187 | 187 | ||
188 | spin_lock_irqsave(&spitzkbd_data->lock, flags); | 188 | spin_lock_irqsave(&spitzkbd_data->lock, flags); |
189 | 189 | ||
190 | input_regs(spitzkbd_data->input, regs); | ||
191 | |||
192 | num_pressed = 0; | 190 | num_pressed = 0; |
193 | for (col = 0; col < KB_COLS; col++) { | 191 | for (col = 0; col < KB_COLS; col++) { |
194 | /* | 192 | /* |
@@ -239,14 +237,14 @@ static void spitzkbd_scankeyboard(struct spitzkbd *spitzkbd_data, struct pt_regs | |||
239 | /* | 237 | /* |
240 | * spitz keyboard interrupt handler. | 238 | * spitz keyboard interrupt handler. |
241 | */ | 239 | */ |
242 | static irqreturn_t spitzkbd_interrupt(int irq, void *dev_id, struct pt_regs *regs) | 240 | static irqreturn_t spitzkbd_interrupt(int irq, void *dev_id) |
243 | { | 241 | { |
244 | struct spitzkbd *spitzkbd_data = dev_id; | 242 | struct spitzkbd *spitzkbd_data = dev_id; |
245 | 243 | ||
246 | if (!timer_pending(&spitzkbd_data->timer)) { | 244 | if (!timer_pending(&spitzkbd_data->timer)) { |
247 | /** wait chattering delay **/ | 245 | /** wait chattering delay **/ |
248 | udelay(20); | 246 | udelay(20); |
249 | spitzkbd_scankeyboard(spitzkbd_data, regs); | 247 | spitzkbd_scankeyboard(spitzkbd_data); |
250 | } | 248 | } |
251 | 249 | ||
252 | return IRQ_HANDLED; | 250 | return IRQ_HANDLED; |
@@ -267,7 +265,7 @@ static void spitzkbd_timer_callback(unsigned long data) | |||
267 | * We debounce the switches and pass them to the input system. | 265 | * We debounce the switches and pass them to the input system. |
268 | */ | 266 | */ |
269 | 267 | ||
270 | static irqreturn_t spitzkbd_hinge_isr(int irq, void *dev_id, struct pt_regs *regs) | 268 | static irqreturn_t spitzkbd_hinge_isr(int irq, void *dev_id) |
271 | { | 269 | { |
272 | struct spitzkbd *spitzkbd_data = dev_id; | 270 | struct spitzkbd *spitzkbd_data = dev_id; |
273 | 271 | ||