Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

[linux-2.6.git] / drivers / video / backlight / backlight.c

diff --git a/drivers/video/backlight/backlight.c b/drivers/video/backlight/backlight.c
index acc81cb..27597c5 100644 (file)
--- a/drivers/video/backlight/backlight.c
+++ b/drivers/video/backlight/backlight.c
@@ -5,7 +5,6 @@
  *
  */
 
-#include <linux/version.h>
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/device.h>
@@ -14,18 +13,15 @@
 #include <linux/ctype.h>
 #include <linux/err.h>
 #include <linux/fb.h>
-#include <asm/bug.h>
 
 static ssize_t backlight_show_power(struct class_device *cdev, char *buf)
 {
-       int rc;
+       int rc = -ENXIO;
        struct backlight_device *bd = to_backlight_device(cdev);
 
        down(&bd->sem);
-       if (likely(bd->props && bd->props->get_power))
-               rc = sprintf(buf, "%d\n", bd->props->get_power(bd));
-       else
-               rc = -ENXIO;
+       if (likely(bd->props))
+               rc = sprintf(buf, "%d\n", bd->props->power);
        up(&bd->sem);
 
        return rc;
@@ -33,21 +29,25 @@ static ssize_t backlight_show_power(struct class_device *cdev, char *buf)
 
 static ssize_t backlight_store_power(struct class_device *cdev, const char *buf, size_t count)
 {
-       int rc, power;
+       int rc = -ENXIO;
        char *endp;
        struct backlight_device *bd = to_backlight_device(cdev);
+       int power = simple_strtoul(buf, &endp, 0);
+       size_t size = endp - buf;
 
-       power = simple_strtoul(buf, &endp, 0);
-       if (*endp && !isspace(*endp))
+       if (*endp && isspace(*endp))
+               size++;
+       if (size != count)
                return -EINVAL;
 
        down(&bd->sem);
-       if (likely(bd->props && bd->props->set_power)) {
+       if (likely(bd->props)) {
                pr_debug("backlight: set power to %d\n", power);
-               bd->props->set_power(bd, power);
+               bd->props->power = power;
+               if (likely(bd->props->update_status))
+                       bd->props->update_status(bd);
                rc = count;
-       } else
-               rc = -ENXIO;
+       }
        up(&bd->sem);
 
        return rc;
@@ -55,14 +55,12 @@ static ssize_t backlight_store_power(struct class_device *cdev, const char *buf,
 
 static ssize_t backlight_show_brightness(struct class_device *cdev, char *buf)
 {
-       int rc;
+       int rc = -ENXIO;
        struct backlight_device *bd = to_backlight_device(cdev);
 
        down(&bd->sem);
-       if (likely(bd->props && bd->props->get_brightness))
-               rc = sprintf(buf, "%d\n", bd->props->get_brightness(bd));
-       else
-               rc = -ENXIO;
+       if (likely(bd->props))
+               rc = sprintf(buf, "%d\n", bd->props->brightness);
        up(&bd->sem);
 
        return rc;
@@ -70,21 +68,30 @@ static ssize_t backlight_show_brightness(struct class_device *cdev, char *buf)
 
 static ssize_t backlight_store_brightness(struct class_device *cdev, const char *buf, size_t count)
 {
-       int rc, brightness;
+       int rc = -ENXIO;
        char *endp;
        struct backlight_device *bd = to_backlight_device(cdev);
+       int brightness = simple_strtoul(buf, &endp, 0);
+       size_t size = endp - buf;
 
-       brightness = simple_strtoul(buf, &endp, 0);
-       if (*endp && !isspace(*endp))
+       if (*endp && isspace(*endp))
+               size++;
+       if (size != count)
                return -EINVAL;
 
        down(&bd->sem);
-       if (likely(bd->props && bd->props->set_brightness)) {
-               pr_debug("backlight: set brightness to %d\n", brightness);
-               bd->props->set_brightness(bd, brightness);
-               rc = count;
-       } else
-               rc = -ENXIO;
+       if (likely(bd->props)) {
+               if (brightness > bd->props->max_brightness)
+                       rc = -EINVAL;
+               else {
+                       pr_debug("backlight: set brightness to %d\n",
+                                brightness);
+                       bd->props->brightness = brightness;
+                       if (likely(bd->props->update_status))
+                               bd->props->update_status(bd);
+                       rc = count;
+               }
+       }
        up(&bd->sem);
 
        return rc;
@@ -92,14 +99,26 @@ static ssize_t backlight_store_brightness(struct class_device *cdev, const char
 
 static ssize_t backlight_show_max_brightness(struct class_device *cdev, char *buf)
 {
-       int rc;
+       int rc = -ENXIO;
        struct backlight_device *bd = to_backlight_device(cdev);
 
        down(&bd->sem);
        if (likely(bd->props))
                rc = sprintf(buf, "%d\n", bd->props->max_brightness);
-       else
-               rc = -ENXIO;
+       up(&bd->sem);
+
+       return rc;
+}
+
+static ssize_t backlight_show_actual_brightness(struct class_device *cdev,
+                                               char *buf)
+{
+       int rc = -ENXIO;
+       struct backlight_device *bd = to_backlight_device(cdev);
+
+       down(&bd->sem);
+       if (likely(bd->props && bd->props->get_brightness))
+               rc = sprintf(buf, "%d\n", bd->props->get_brightness(bd));
        up(&bd->sem);
 
        return rc;
@@ -125,7 +144,10 @@ static struct class backlight_class = {
 
 static struct class_device_attribute bl_class_device_attributes[] = {
        DECLARE_ATTR(power, 0644, backlight_show_power, backlight_store_power),
-       DECLARE_ATTR(brightness, 0644, backlight_show_brightness, backlight_store_brightness),
+       DECLARE_ATTR(brightness, 0644, backlight_show_brightness,
+                    backlight_store_brightness),
+       DECLARE_ATTR(actual_brightness, 0444, backlight_show_actual_brightness,
+                    NULL),
        DECLARE_ATTR(max_brightness, 0444, backlight_show_max_brightness, NULL),
 };
 
@@ -146,8 +168,12 @@ static int fb_notifier_callback(struct notifier_block *self,
        bd = container_of(self, struct backlight_device, fb_notif);
        down(&bd->sem);
        if (bd->props)
-               if (!bd->props->check_fb || bd->props->check_fb(evdata->info))
-                       bd->props->set_power(bd, *(int *)evdata->data);
+               if (!bd->props->check_fb ||
+                   bd->props->check_fb(evdata->info)) {
+                       bd->props->fb_blank = *(int *)evdata->data;
+                       if (likely(bd->props && bd->props->update_status))
+                               bd->props->update_status(bd);
+               }
        up(&bd->sem);
        return 0;
 }
@@ -174,7 +200,7 @@ struct backlight_device *backlight_device_register(const char *name, void *devda
 
        new_bd = kmalloc(sizeof(struct backlight_device), GFP_KERNEL);
        if (unlikely(!new_bd))
-               return ERR_PTR(ENOMEM);
+               return ERR_PTR(-ENOMEM);
 
        init_MUTEX(&new_bd->sem);
        new_bd->props = bp;
@@ -233,6 +259,12 @@ void backlight_device_unregister(struct backlight_device *bd)
                                         &bl_class_device_attributes[i]);
 
        down(&bd->sem);
+       if (likely(bd->props && bd->props->update_status)) {
+               bd->props->brightness = 0;
+               bd->props->power = 0;
+               bd->props->update_status(bd);
+       }
+
        bd->props = NULL;
        up(&bd->sem);