backlight: Use backlight_get_brightness() throughout

[sfrench/cifs-2.6.git] / drivers / video / backlight / pwm_bl.c

diff --git a/drivers/video/backlight/pwm_bl.c b/drivers/video/backlight/pwm_bl.c
index 82b8d7594701d00e9b4fab22c346e55dc92bcc7a..eff64db2e02ee625cdcea418c92b9e4b59da860f 100644 (file)
--- a/drivers/video/backlight/pwm_bl.c
+++ b/drivers/video/backlight/pwm_bl.c
@@ -108,14 +108,9 @@ static int compute_duty_cycle(struct pwm_bl_data *pb, int brightness)
 static int pwm_backlight_update_status(struct backlight_device *bl)
 {
        struct pwm_bl_data *pb = bl_get_data(bl);
-       int brightness = bl->props.brightness;
+       int brightness = backlight_get_brightness(bl);
        struct pwm_state state;
 
-       if (bl->props.power != FB_BLANK_UNBLANK ||
-           bl->props.fb_blank != FB_BLANK_UNBLANK ||
-           bl->props.state & BL_CORE_FBBLANK)
-               brightness = 0;
-
        if (pb->notify)
                brightness = pb->notify(pb->dev, brightness);