Input: omap-keypad - remove adjusting of scan delay

PATCH New Dmitry Torokhov 1 participant 1 message Jan 8, 2016

Subsystems (2)

HID Input drivers

lore

Share & tools

lore

Dmitry Torokhov

author maintainer

2016-01-08 06:41 UTC #0 lore raw

PATCH 1/1 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.

Signed-off-by Dmitry Torokhov <[email protected]>

---
 drivers/input/keyboard/omap-keypad.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

drivers/input/keyboard/omap-keypad.c +1 -5

index e0d72c8..d115acf 100644
@@ -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);

Signature · 5 lines

2.6.0.rc2.230.g3dd15c0


-- 
Dmitry