diff options
| author | Mans Rullgard <mans@mansr.com> | 2019-03-01 18:48:15 +0000 |
|---|---|---|
| committer | Miguel Ojeda <miguel.ojeda.sandonis@gmail.com> | 2019-03-17 08:48:39 +0100 |
| commit | c9171722459fdeab0f27790ae04c0c5a4ae5a9b2 (patch) | |
| tree | c24ee34448fe1fe318e78d47f49a7f275414773d | |
| parent | 24c764abfd0d4b6e8e33c3818b668edbb4936d6f (diff) | |
| download | linux-c9171722459fdeab0f27790ae04c0c5a4ae5a9b2.tar.gz linux-c9171722459fdeab0f27790ae04c0c5a4ae5a9b2.tar.bz2 linux-c9171722459fdeab0f27790ae04c0c5a4ae5a9b2.zip | |
auxdisplay: charlcd: simplify init message display
If CONFIG_PANEL_CHANGE_MESSAGE is set, CONFIG_PANEL_BOOT_MESSAGE will
also be defined, so the double ifdef is pointless. Simplify the code
further by using an intermediate macro rather duplicating most of the
line.
Signed-off-by: Mans Rullgard <mans@mansr.com>
Signed-off-by: Miguel Ojeda <miguel.ojeda.sandonis@gmail.com>
| -rw-r--r-- | drivers/auxdisplay/charlcd.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/drivers/auxdisplay/charlcd.c b/drivers/auxdisplay/charlcd.c index a351a9400054..5212675564d7 100644 --- a/drivers/auxdisplay/charlcd.c +++ b/drivers/auxdisplay/charlcd.c @@ -763,6 +763,12 @@ static void charlcd_puts(struct charlcd *lcd, const char *s) } } +#ifdef CONFIG_PANEL_BOOT_MESSAGE +#define LCD_INIT_TEXT CONFIG_PANEL_BOOT_MESSAGE +#else +#define LCD_INIT_TEXT "Linux-" UTS_RELEASE "\n" +#endif + /* initialize the LCD driver */ static int charlcd_init(struct charlcd *lcd) { @@ -784,13 +790,8 @@ static int charlcd_init(struct charlcd *lcd) return ret; /* display a short message */ -#ifdef CONFIG_PANEL_CHANGE_MESSAGE -#ifdef CONFIG_PANEL_BOOT_MESSAGE - charlcd_puts(lcd, "\x1b[Lc\x1b[Lb\x1b[L*" CONFIG_PANEL_BOOT_MESSAGE); -#endif -#else - charlcd_puts(lcd, "\x1b[Lc\x1b[Lb\x1b[L*Linux-" UTS_RELEASE "\n"); -#endif + charlcd_puts(lcd, "\x1b[Lc\x1b[Lb\x1b[L*" LCD_INIT_TEXT); + /* clear the display on the next device opening */ priv->must_clear = true; charlcd_home(lcd); |