leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Input: omap-keypad - remove adjusting of scan delay

Browse Source 
As of 35f8679f57 ("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>
This commit is contained in:
Dmitry Torokhov 2016-01-07 22:25:39 -08:00
parent 7d8d862523
commit 9401668073
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/input/keyboard/omap-keypad.c
View File

@ -133,7 +133,6 @@ static void omap_kp_tasklet(unsigned long data)
unsigned int row_shift = get_count_order(omap_kp_data->cols); unsigned int row_shift = get_count_order(omap_kp_data->cols);
unsigned char new_state[8], changed, key_down = 0; unsigned char new_state[8], changed, key_down = 0;
int col, row; int col, row;
int spurious = 0;
/* check for any changes */ /* check for any changes */
omap_kp_scan_keypad(omap_kp_data, new_state); 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)); memcpy(keypad_state, new_state, sizeof(keypad_state));
if (key_down) { if (key_down) {
int delay = HZ / 20;
/* some key is pressed - keep irq disabled and use timer /* some key is pressed - keep irq disabled and use timer
* to poll the keypad */ * to poll the keypad */
if (spurious) mod_timer(&omap_kp_data->timer, jiffies + HZ / 20);
delay = 2 * HZ;
mod_timer(&omap_kp_data->timer, jiffies + delay);
} else { } else {
/* enable interrupts */ /* enable interrupts */
omap_writew(0, OMAP1_MPUIO_BASE + OMAP_MPUIO_KBD_MASKIT); omap_writew(0, OMAP1_MPUIO_BASE + OMAP_MPUIO_KBD_MASKIT);