diff options
Diffstat (limited to 'drivers/macintosh/via-pmu-backlight.c')
| -rw-r--r-- | drivers/macintosh/via-pmu-backlight.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/drivers/macintosh/via-pmu-backlight.c b/drivers/macintosh/via-pmu-backlight.c index 50ada02ae75d..d91825bb0a5c 100644 --- a/drivers/macintosh/via-pmu-backlight.c +++ b/drivers/macintosh/via-pmu-backlight.c @@ -10,9 +10,11 @@ #include <asm/ptrace.h> #include <linux/adb.h> +#include <linux/backlight.h> +#include <linux/fb.h> +#include <linux/of.h> #include <linux/pmu.h> #include <asm/backlight.h> -#include <asm/prom.h> #define MAX_PMU_LEVEL 0xFF @@ -72,12 +74,7 @@ static int pmu_backlight_get_level_brightness(int level) static int __pmu_backlight_update_status(struct backlight_device *bd) { struct adb_request req; - int level = bd->props.brightness; - - - if (bd->props.power != FB_BLANK_UNBLANK || - bd->props.fb_blank != FB_BLANK_UNBLANK) - level = 0; + int level = backlight_get_brightness(bd); if (level > 0) { int pmulevel = pmu_backlight_get_level_brightness(level); @@ -183,7 +180,7 @@ void __init pmu_backlight_init(void) } bd->props.brightness = level; - bd->props.power = FB_BLANK_UNBLANK; + bd->props.power = BACKLIGHT_POWER_ON; backlight_update_status(bd); printk(KERN_INFO "PMU Backlight initialized (%s)\n", name); |