Loading drivers/misc/panel.c +6 −12 Original line number Original line Diff line number Diff line Loading @@ -64,8 +64,6 @@ #define LCD_MINOR 156 #define LCD_MINOR 156 #define KEYPAD_MINOR 185 #define KEYPAD_MINOR 185 #define PANEL_VERSION "0.9.5" #define LCD_MAXBYTES 256 /* max burst write */ #define LCD_MAXBYTES 256 /* max burst write */ #define KEYPAD_BUFFER 64 #define KEYPAD_BUFFER 64 Loading Loading @@ -1656,8 +1654,7 @@ static void lcd_init(void) panel_lcd_print("\x1b[Lc\x1b[Lb\x1b[L*" CONFIG_PANEL_BOOT_MESSAGE); panel_lcd_print("\x1b[Lc\x1b[Lb\x1b[L*" CONFIG_PANEL_BOOT_MESSAGE); #endif #endif #else #else panel_lcd_print("\x1b[Lc\x1b[Lb\x1b[L*Linux-" UTS_RELEASE "\nPanel-" panel_lcd_print("\x1b[Lc\x1b[Lb\x1b[L*Linux-" UTS_RELEASE); PANEL_VERSION); #endif #endif lcd.addr.x = 0; lcd.addr.x = 0; lcd.addr.y = 0; lcd.addr.y = 0; Loading Loading @@ -2278,8 +2275,7 @@ static void panel_detach(struct parport *port) } } if (lcd.enabled) { if (lcd.enabled) { panel_lcd_print("\x0cLCD driver " PANEL_VERSION panel_lcd_print("\x0cLCD driver unloaded.\x1b[Lc\x1b[Lb\x1b[L-"); "\nunloaded.\x1b[Lc\x1b[Lb\x1b[L-"); misc_deregister(&lcd_dev); misc_deregister(&lcd_dev); lcd.initialized = false; lcd.initialized = false; } } Loading Loading @@ -2401,7 +2397,7 @@ static int __init panel_init_module(void) if (!lcd.enabled && !keypad.enabled) { if (!lcd.enabled && !keypad.enabled) { /* no device enabled, let's exit */ /* no device enabled, let's exit */ pr_err("driver version " PANEL_VERSION " disabled.\n"); pr_err("panel driver disabled.\n"); return -ENODEV; return -ENODEV; } } Loading @@ -2412,12 +2408,10 @@ static int __init panel_init_module(void) } } if (pprt) if (pprt) pr_info("driver version " PANEL_VERSION pr_info("panel driver registered on parport%d (io=0x%lx).\n", " registered on parport%d (io=0x%lx).\n", parport, parport, pprt->port->base); pprt->port->base); else else pr_info("driver version " PANEL_VERSION pr_info("panel driver not yet registered\n"); " not yet registered\n"); return 0; return 0; } } Loading Loading
drivers/misc/panel.c +6 −12 Original line number Original line Diff line number Diff line Loading @@ -64,8 +64,6 @@ #define LCD_MINOR 156 #define LCD_MINOR 156 #define KEYPAD_MINOR 185 #define KEYPAD_MINOR 185 #define PANEL_VERSION "0.9.5" #define LCD_MAXBYTES 256 /* max burst write */ #define LCD_MAXBYTES 256 /* max burst write */ #define KEYPAD_BUFFER 64 #define KEYPAD_BUFFER 64 Loading Loading @@ -1656,8 +1654,7 @@ static void lcd_init(void) panel_lcd_print("\x1b[Lc\x1b[Lb\x1b[L*" CONFIG_PANEL_BOOT_MESSAGE); panel_lcd_print("\x1b[Lc\x1b[Lb\x1b[L*" CONFIG_PANEL_BOOT_MESSAGE); #endif #endif #else #else panel_lcd_print("\x1b[Lc\x1b[Lb\x1b[L*Linux-" UTS_RELEASE "\nPanel-" panel_lcd_print("\x1b[Lc\x1b[Lb\x1b[L*Linux-" UTS_RELEASE); PANEL_VERSION); #endif #endif lcd.addr.x = 0; lcd.addr.x = 0; lcd.addr.y = 0; lcd.addr.y = 0; Loading Loading @@ -2278,8 +2275,7 @@ static void panel_detach(struct parport *port) } } if (lcd.enabled) { if (lcd.enabled) { panel_lcd_print("\x0cLCD driver " PANEL_VERSION panel_lcd_print("\x0cLCD driver unloaded.\x1b[Lc\x1b[Lb\x1b[L-"); "\nunloaded.\x1b[Lc\x1b[Lb\x1b[L-"); misc_deregister(&lcd_dev); misc_deregister(&lcd_dev); lcd.initialized = false; lcd.initialized = false; } } Loading Loading @@ -2401,7 +2397,7 @@ static int __init panel_init_module(void) if (!lcd.enabled && !keypad.enabled) { if (!lcd.enabled && !keypad.enabled) { /* no device enabled, let's exit */ /* no device enabled, let's exit */ pr_err("driver version " PANEL_VERSION " disabled.\n"); pr_err("panel driver disabled.\n"); return -ENODEV; return -ENODEV; } } Loading @@ -2412,12 +2408,10 @@ static int __init panel_init_module(void) } } if (pprt) if (pprt) pr_info("driver version " PANEL_VERSION pr_info("panel driver registered on parport%d (io=0x%lx).\n", " registered on parport%d (io=0x%lx).\n", parport, parport, pprt->port->base); pprt->port->base); else else pr_info("driver version " PANEL_VERSION pr_info("panel driver not yet registered\n"); " not yet registered\n"); return 0; return 0; } } Loading