Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[firefly-linux-kernel-4.4.55.git] / drivers / video / backlight / jornada720_lcd.c

diff --git a/drivers/video/backlight/jornada720_lcd.c b/drivers/video/backlight/jornada720_lcd.c
index 228bc319de1922251d3c4cffb5adf190c375393b..dfa0fa0d5c782c082efcd04fe9a5f1ed964787a4 100644 (file)
--- a/drivers/video/backlight/jornada720_lcd.c
+++ b/drivers/video/backlight/jornada720_lcd.c
@@ -27,11 +27,7 @@
 
 static int jornada_lcd_get_power(struct lcd_device *ld)
 {
-       /* LDD2 in PPC = LCD POWER */
-       if (PPSR & PPC_LDD2)
-               return FB_BLANK_UNBLANK;        /* PW ON */
-       else
-               return FB_BLANK_POWERDOWN;      /* PW OFF */
+       return PPSR & PPC_LDD2 ? FB_BLANK_UNBLANK : FB_BLANK_POWERDOWN;
 }
 
 static int jornada_lcd_get_contrast(struct lcd_device *ld)