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

Commit cf940ebe authored by Andreas Platschek's avatar Andreas Platschek Committed by Greg Kroah-Hartman
Browse files

tty: Remove dead code 



-> The ledptrs[] array is never initialized.
-> There is no place where kbd->ledmode is set to LED_SHOW_MEM therefore the if
   statement does not make much sense.
-> Since LED_SHOW_MEM is not used, it can be removed from the header file as well.

Signed-off-by: default avatarAndreas Platschek <andi.platschek@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 17fae28e

drivers/tty/vt/keyboard.c

+1 −20
Original line number Diff line number Diff line
@@ -132,12 +132,6 @@ static int shift_state = 0; 
static unsigned char ledstate = 0xff;			/* undefined */

static unsigned char ledioctl;



static struct ledptr {

	unsigned int *addr;

	unsigned int mask;

	unsigned char valid:1;

} ledptrs[3];



/*

 * Notifier list for console keyboard events

 */
@@ -994,24 +988,11 @@ void setledstate(struct kbd_struct *kbd, unsigned int led) 
static inline unsigned char getleds(void)

{

	struct kbd_struct *kbd = kbd_table + fg_console;

	unsigned char leds;

	int i;



	if (kbd->ledmode == LED_SHOW_IOCTL)

		return ledioctl;



	leds = kbd->ledflagstate;



	if (kbd->ledmode == LED_SHOW_MEM) {

		for (i = 0; i < 3; i++)

			if (ledptrs[i].valid) {

				if (*ledptrs[i].addr & ledptrs[i].mask)

					leds |= (1 << i);

				else

					leds &= ~(1 << i);

			}

	}

	return leds;

	return kbd->ledflagstate;

}



static int kbd_update_leds_helper(struct input_handle *handle, void *data)

include/linux/kbd_kern.h

+1 −2
Original line number Diff line number Diff line
@@ -36,10 +36,9 @@ struct kbd_struct { 
#define VC_CTRLRLOCK	KG_CTRLR 	/* ctrlr lock mode */

	unsigned char slockstate; 	/* for `sticky' Shift, Ctrl, etc. */



	unsigned char ledmode:2; 	/* one 2-bit value */

	unsigned char ledmode:1;

#define LED_SHOW_FLAGS 0        /* traditional state */

#define LED_SHOW_IOCTL 1        /* only change leds upon ioctl */

#define LED_SHOW_MEM 2          /* `heartbeat': peek into memory */



	unsigned char ledflagstate:4;	/* flags, not lights */

	unsigned char default_ledflagstate:4;