Merge branch 'release' of master.kernel.org:/home/ftp/pub/scm/linux/kernel/git/aegl...

[linux-2.6] / include / linux / backlight.h

diff --git a/include/linux/backlight.h b/include/linux/backlight.h
index bb9e543223225ccdd9a176bfb1babf67462f5908..75e91f5b6a04ce7dc0626599d9d21ac08f8b3059 100644 (file)
--- a/include/linux/backlight.h
+++ b/include/linux/backlight.h
@@ -19,20 +19,25 @@ struct fb_info;
 struct backlight_properties {
        /* Owner module */
        struct module *owner;
-       /* Get the backlight power status (0: full on, 1..3: power saving
-          modes; 4: full off), see FB_BLANK_XXX */
-       int (*get_power)(struct backlight_device *);
-       /* Enable or disable power to the LCD (0: on; 4: off, see FB_BLANK_XXX) */
-       int (*set_power)(struct backlight_device *, int power);
-       /* Maximal value for brightness (read-only) */
-       int max_brightness;
-       /* Get current backlight brightness */
+
+       /* Notify the backlight driver some property has changed */
+       int (*update_status)(struct backlight_device *);
+       /* Return the current backlight brightness (accounting for power,
+          fb_blank etc.) */
        int (*get_brightness)(struct backlight_device *);
-       /* Set backlight brightness (0..max_brightness) */
-       int (*set_brightness)(struct backlight_device *, int brightness);
        /* Check if given framebuffer device is the one bound to this backlight;
           return 0 if not, !=0 if it is. If NULL, backlight always matches the fb. */
        int (*check_fb)(struct fb_info *);
+
+       /* Current User requested brightness (0 - max_brightness) */
+       int brightness;
+       /* Maximal value for brightness (read-only) */
+       int max_brightness;
+       /* Current FB Power mode (0: full on, 1..3: power saving
+          modes; 4: full off), see FB_BLANK_XXX */
+       int power;
+       /* FB Blanking active? (values as for power) */
+       int fb_blank;
 };
 
 struct backlight_device {