Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 94016680 authored by Dmitry Torokhov's avatar Dmitry Torokhov
Browse files

Input: omap-keypad - remove adjusting of scan delay 



As of 35f8679f ("Input: omap-keypad -
remove dead check") we no longer declare keypresses as spurious, therefore
we can use constant delay between scans.

Suggested-by: default avatarJanusz Krzysztofik <jkrzyszt@tis.icnet.pl>
Signed-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
parent 7d8d8625

drivers/input/keyboard/omap-keypad.c

+1 −5
Original line number Diff line number Diff line
@@ -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);