auxdisplay: Call charlcd_backlight in place
authorLars Poeschel <poeschel@lemonage.de>
Tue, 3 Nov 2020 09:58:21 +0000 (10:58 +0100)
committerMiguel Ojeda <ojeda@kernel.org>
Wed, 4 Nov 2020 10:04:04 +0000 (11:04 +0100)
This moves the call to charlcd_backlight from the end of the switch
into the actual case statement that originates the change of the
backlight. This is more consistent to what is now found in this switch.

Reviewed-by: Willy Tarreau <w@1wt.eu>
Signed-off-by: Lars Poeschel <poeschel@lemonage.de>
Signed-off-by: Miguel Ojeda <ojeda@kernel.org>
drivers/auxdisplay/charlcd.c

index dca1b138a239139001434702d91e06ad640d8b21..0f0568a4bd35cb4c04c358fe240ac45b939e8733 100644 (file)
@@ -259,10 +259,16 @@ static inline int handle_lcd_special_code(struct charlcd *lcd)
                break;
        case '+':       /* Back light ON */
                priv->flags |= LCD_FLAG_L;
+               if (priv->flags != oldflags)
+                       charlcd_backlight(lcd, CHARLCD_ON);
+
                processed = 1;
                break;
        case '-':       /* Back light OFF */
                priv->flags &= ~LCD_FLAG_L;
+               if (priv->flags != oldflags)
+                       charlcd_backlight(lcd, CHARLCD_OFF);
+
                processed = 1;
                break;
        case '*':       /* Flash back light */
@@ -363,14 +369,6 @@ static inline int handle_lcd_special_code(struct charlcd *lcd)
                break;
        }
 
-       /* TODO: This indent party here got ugly, clean it! */
-       /* Check whether one flag was changed */
-       if (oldflags == priv->flags)
-               return processed;
-
-       if ((oldflags ^ priv->flags) & LCD_FLAG_L)
-               charlcd_backlight(lcd, !!(priv->flags & LCD_FLAG_L));
-
        return processed;
 }