backlight: gpio_backlight: Simplify update_status()

Introduce the use of backlight_get_brightness() to simplify the
update_status() operation. With the simpler implementation drop the
gpio_backlight_get_next_brightness() helper as it was now a
one-liner.

Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Reviewed-by: Daniel Thompson <daniel.thompson@linaro.org>
Signed-off-by: Lee Jones <lee.jones@linaro.org>

diff --git a/drivers/video/backlight/gpio_backlight.c b/drivers/video/backlight/gpio_backlight.c
index 75409dd..6f78d92 100644 (file)
--- a/drivers/video/backlight/gpio_backlight.c
+++ b/drivers/video/backlight/gpio_backlight.c
@@ -21,24 +21,11 @@ struct gpio_backlight {
        struct gpio_desc *gpiod;
 };
 
-static int gpio_backlight_get_next_brightness(struct backlight_device *bl)
-{
-       int brightness = bl->props.brightness;
-
-       if (bl->props.power != FB_BLANK_UNBLANK ||
-           bl->props.fb_blank != FB_BLANK_UNBLANK ||
-           bl->props.state & (BL_CORE_SUSPENDED | BL_CORE_FBBLANK))
-               brightness = 0;
-
-       return brightness;
-}
-
 static int gpio_backlight_update_status(struct backlight_device *bl)
 {
        struct gpio_backlight *gbl = bl_get_data(bl);
-       int brightness = gpio_backlight_get_next_brightness(bl);
 
-       gpiod_set_value_cansleep(gbl->gpiod, brightness);
+       gpiod_set_value_cansleep(gbl->gpiod, backlight_get_brightness(bl));
 
        return 0;
 }
@@ -108,7 +95,7 @@ static int gpio_backlight_probe(struct platform_device *pdev)
 
        bl->props.brightness = 1;
 
-       init_brightness = gpio_backlight_get_next_brightness(bl);
+       init_brightness = backlight_get_brightness(bl);
        ret = gpiod_direction_output(gbl->gpiod, init_brightness);
        if (ret) {
                dev_err(dev, "failed to set initial brightness\n");