diff options
| author |   Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2016-01-07 22:25:39 -0800 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2016-04-05 10:17:18 -0700 |
| commit | 94016680737fd5f9dcfac3fe65b2e61d38fcfba6 (patch) | |
| tree | 8973165e59153b5a75cd03b7548f810b9f51e524 /drivers/input/keyboard/omap-keypad.c | |
| parent | Input: gpio-keys - clean up device tree binding example (diff) | |
| download | linux-dev-94016680737fd5f9dcfac3fe65b2e61d38fcfba6.tar.xz linux-dev-94016680737fd5f9dcfac3fe65b2e61d38fcfba6.zip | |
Input: omap-keypad - remove adjusting of scan delay
As of 35f8679f577ae5673a778598bcbe7b45cbec8923 ("Input: omap-keypad -
remove dead check") we no longer declare keypresses as spurious, therefore
we can use constant delay between scans.
Suggested-by: Janusz Krzysztofik <jkrzyszt@tis.icnet.pl>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Diffstat (limited to '')
| -rw-r--r-- | drivers/input/keyboard/omap-keypad.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/input/keyboard/omap-keypad.c b/drivers/input/keyboard/omap-keypad.c index e0d72c8c01e4..d115acf0a805 100644 --- a/drivers/input/keyboard/omap-keypad.c +++ b/drivers/input/keyboard/omap-keypad.c @@ -133,7 +133,6 @@ static void omap_kp_tasklet(unsigned long data) unsigned int row_shift = get_count_order(omap_kp_data->cols); unsigned char new_state[8], changed, key_down = 0; int col, row; - int spurious = 0; /* check for any changes */ omap_kp_scan_keypad(omap_kp_data, new_state); @@ -170,12 +169,9 @@ static void omap_kp_tasklet(unsigned long data) memcpy(keypad_state, new_state, sizeof(keypad_state)); if (key_down) { - int delay = HZ / 20; /* some key is pressed - keep irq disabled and use timer * to poll the keypad */ - if (spurious) - delay = 2 * HZ; - mod_timer(&omap_kp_data->timer, jiffies + delay); + mod_timer(&omap_kp_data->timer, jiffies + HZ / 20); } else { /* enable interrupts */ omap_writew(0, OMAP1_MPUIO_BASE + OMAP_MPUIO_KBD_MASKIT); |