[PATCH 3/6] backlight/omap1-bl: Replace FB_BLANK_ states with simple on/off

[Thomas Zimmermann]

The backlight is on for fb_blank eq FB_BLANK_UNBLANK, or off for
any other value in fb_blank. But the field fb_blank in struct
backlight_properties is deprecated and should not be used any
longer.

Replace the test for fb_blank in omap's backlight code with a
simple boolean parameter and push the test into the update_status
helper. Instead of reading fb_blank directly, decode the backlight
device's status with backlight_is_blank().

Signed-off-by: Thomas Zimmermann <tzimmerm...@suse.de>
---
 drivers/video/backlight/omap1_bl.c | 46 ++++++++++++++----------------
 1 file changed, 21 insertions(+), 25 deletions(-)

diff --git a/drivers/video/backlight/omap1_bl.c 
b/drivers/video/backlight/omap1_bl.c
index 84d148f385951..3fd8bbb7f5877 100644
--- a/drivers/video/backlight/omap1_bl.c
+++ b/drivers/video/backlight/omap1_bl.c
@@ -9,7 +9,6 @@
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/platform_device.h>
-#include <linux/fb.h>
 #include <linux/backlight.h>
 #include <linux/slab.h>
 #include <linux/platform_data/omap1_bl.h>
@@ -20,7 +19,7 @@
 #define OMAPBL_MAX_INTENSITY           0xff
 
 struct omap_backlight {
-       int powermode;
+       bool power;
        int current_intensity;
 
        struct device *dev;
@@ -37,21 +36,14 @@ static inline void omapbl_send_enable(int enable)
        omap_writeb(enable, OMAP_PWL_CLK_ENABLE);
 }
 
-static void omapbl_blank(struct omap_backlight *bl, int mode)
+static void omapbl_power(struct omap_backlight *bl, bool on)
 {
-       switch (mode) {
-       case FB_BLANK_NORMAL:
-       case FB_BLANK_VSYNC_SUSPEND:
-       case FB_BLANK_HSYNC_SUSPEND:
-       case FB_BLANK_POWERDOWN:
-               omapbl_send_intensity(0);
-               omapbl_send_enable(0);
-               break;
-
-       case FB_BLANK_UNBLANK:
+       if (on) {
                omapbl_send_intensity(bl->current_intensity);
                omapbl_send_enable(1);
-               break;
+       } else {
+               omapbl_send_intensity(0);
+               omapbl_send_enable(0);
        }
 }
 
@@ -61,7 +53,7 @@ static int omapbl_suspend(struct device *dev)
        struct backlight_device *bl_dev = dev_get_drvdata(dev);
        struct omap_backlight *bl = bl_get_data(bl_dev);
 
-       omapbl_blank(bl, FB_BLANK_POWERDOWN);
+       omapbl_power(bl, false);
        return 0;
 }
 
@@ -70,33 +62,37 @@ static int omapbl_resume(struct device *dev)
        struct backlight_device *bl_dev = dev_get_drvdata(dev);
        struct omap_backlight *bl = bl_get_data(bl_dev);
 
-       omapbl_blank(bl, bl->powermode);
+       omapbl_power(bl, bl->power);
        return 0;
 }
 #endif
 
-static int omapbl_set_power(struct backlight_device *dev, int state)
+static void omapbl_set_power(struct backlight_device *dev, bool on)
 {
        struct omap_backlight *bl = bl_get_data(dev);
 
-       omapbl_blank(bl, state);
-       bl->powermode = state;
-
-       return 0;
+       omapbl_power(bl, on);
+       bl->power = on;
 }
 
 static int omapbl_update_status(struct backlight_device *dev)
 {
        struct omap_backlight *bl = bl_get_data(dev);
+       bool power;
 
        if (bl->current_intensity != dev->props.brightness) {
-               if (bl->powermode == FB_BLANK_UNBLANK)
+               if (bl->power)
                        omapbl_send_intensity(dev->props.brightness);
                bl->current_intensity = dev->props.brightness;
        }
 
-       if (dev->props.fb_blank != bl->powermode)
-               omapbl_set_power(dev, dev->props.fb_blank);
+       if (backlight_is_blank(dev))
+               power = false;
+       else
+               power = true;
+
+       if (power != bl->power)
+               omapbl_set_power(dev, power);
 
        return 0;
 }
@@ -136,7 +132,7 @@ static int omapbl_probe(struct platform_device *pdev)
        if (IS_ERR(dev))
                return PTR_ERR(dev);
 
-       bl->powermode = FB_BLANK_POWERDOWN;
+       bl->power = false;
        bl->current_intensity = 0;
 
        bl->pdata = pdata;
-- 
2.44.0