aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeert Uytterhoeven <geert@linux-m68k.org>2017-02-06 09:38:04 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-02-10 09:32:53 -0500
commit30f468b2ea7a75aa7e212b7d89eb136a55462ee8 (patch)
tree9914f8f7293a4c96e25dd7998b26642b96e33ba4
parent84a1ed0407d209beff4d9cb41120d0f69a89d4b8 (diff)
misc: panel: Remove PANEL_VERSION
Hardcoded driver versions are so pre-git. Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/misc/panel.c18
1 files changed, 6 insertions, 12 deletions
diff --git a/drivers/misc/panel.c b/drivers/misc/panel.c
index cac7ac62ce5b..fa4c12768a16 100644
--- a/drivers/misc/panel.c
+++ b/drivers/misc/panel.c
@@ -64,8 +64,6 @@
64#define LCD_MINOR 156 64#define LCD_MINOR 156
65#define KEYPAD_MINOR 185 65#define KEYPAD_MINOR 185
66 66
67#define PANEL_VERSION "0.9.5"
68
69#define LCD_MAXBYTES 256 /* max burst write */ 67#define LCD_MAXBYTES 256 /* max burst write */
70 68
71#define KEYPAD_BUFFER 64 69#define KEYPAD_BUFFER 64
@@ -1656,8 +1654,7 @@ static void lcd_init(void)
1656 panel_lcd_print("\x1b[Lc\x1b[Lb\x1b[L*" CONFIG_PANEL_BOOT_MESSAGE); 1654 panel_lcd_print("\x1b[Lc\x1b[Lb\x1b[L*" CONFIG_PANEL_BOOT_MESSAGE);
1657#endif 1655#endif
1658#else 1656#else
1659 panel_lcd_print("\x1b[Lc\x1b[Lb\x1b[L*Linux-" UTS_RELEASE "\nPanel-" 1657 panel_lcd_print("\x1b[Lc\x1b[Lb\x1b[L*Linux-" UTS_RELEASE);
1660 PANEL_VERSION);
1661#endif 1658#endif
1662 lcd.addr.x = 0; 1659 lcd.addr.x = 0;
1663 lcd.addr.y = 0; 1660 lcd.addr.y = 0;
@@ -2278,8 +2275,7 @@ static void panel_detach(struct parport *port)
2278 } 2275 }
2279 2276
2280 if (lcd.enabled) { 2277 if (lcd.enabled) {
2281 panel_lcd_print("\x0cLCD driver " PANEL_VERSION 2278 panel_lcd_print("\x0cLCD driver unloaded.\x1b[Lc\x1b[Lb\x1b[L-");
2282 "\nunloaded.\x1b[Lc\x1b[Lb\x1b[L-");
2283 misc_deregister(&lcd_dev); 2279 misc_deregister(&lcd_dev);
2284 lcd.initialized = false; 2280 lcd.initialized = false;
2285 } 2281 }
@@ -2401,7 +2397,7 @@ static int __init panel_init_module(void)
2401 2397
2402 if (!lcd.enabled && !keypad.enabled) { 2398 if (!lcd.enabled && !keypad.enabled) {
2403 /* no device enabled, let's exit */ 2399 /* no device enabled, let's exit */
2404 pr_err("driver version " PANEL_VERSION " disabled.\n"); 2400 pr_err("panel driver disabled.\n");
2405 return -ENODEV; 2401 return -ENODEV;
2406 } 2402 }
2407 2403
@@ -2412,12 +2408,10 @@ static int __init panel_init_module(void)
2412 } 2408 }
2413 2409
2414 if (pprt) 2410 if (pprt)
2415 pr_info("driver version " PANEL_VERSION 2411 pr_info("panel driver registered on parport%d (io=0x%lx).\n",
2416 " registered on parport%d (io=0x%lx).\n", parport, 2412 parport, pprt->port->base);
2417 pprt->port->base);
2418 else 2413 else
2419 pr_info("driver version " PANEL_VERSION 2414 pr_info("panel driver not yet registered\n");
2420 " not yet registered\n");
2421 return 0; 2415 return 0;
2422} 2416}
2423 2417