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

tty: Remove dead code

Browse Source 
-> 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: Andreas Platschek <andi.platschek@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Andreas Platschek 2013-07-26 06:46:37 +02:00 committed by Greg Kroah-Hartman
parent 17fae28efe
commit cf940ebe98
2 changed files with 2 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
drivers/tty/vt/keyboard.c
View File

@ -132,12 +132,6 @@ static int shift_state = 0;
static unsigned char ledstate = 0xff; /* undefined */ static unsigned char ledstate = 0xff; /* undefined */
static unsigned char ledioctl; 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 * 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) static inline unsigned char getleds(void)
{ {
struct kbd_struct *kbd = kbd_table + fg_console; struct kbd_struct *kbd = kbd_table + fg_console;
unsigned char leds;
int i;
if (kbd->ledmode == LED_SHOW_IOCTL) if (kbd->ledmode == LED_SHOW_IOCTL)
return ledioctl; return ledioctl;
leds = kbd->ledflagstate; return 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;
} }
static int kbd_update_leds_helper(struct input_handle *handle, void *data) static int kbd_update_leds_helper(struct input_handle *handle, void *data)

3
include/linux/kbd_kern.h
View File

@ -36,10 +36,9 @@ struct kbd_struct {
#define VC_CTRLRLOCK KG_CTRLR /* ctrlr lock mode */ #define VC_CTRLRLOCK KG_CTRLR /* ctrlr lock mode */
unsigned char slockstate; /* for `sticky' Shift, Ctrl, etc. */ 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_FLAGS 0 /* traditional state */
#define LED_SHOW_IOCTL 1 /* only change leds upon ioctl */ #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 ledflagstate:4; /* flags, not lights */
unsigned char default_ledflagstate:4; unsigned char default_ledflagstate:4;