linux 2.6.16.38 w/ vs2.0.3-rc1

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

diff --git a/drivers/video/backlight/backlight.c b/drivers/video/backlight/backlight.c
index 27597c5..151fda8 100644 (file)
--- a/drivers/video/backlight/backlight.c
+++ b/drivers/video/backlight/backlight.c
@@ -16,12 +16,14 @@
 
 static ssize_t backlight_show_power(struct class_device *cdev, char *buf)
 {
-       int rc = -ENXIO;
+       int rc;
        struct backlight_device *bd = to_backlight_device(cdev);
 
        down(&bd->sem);
-       if (likely(bd->props))
-               rc = sprintf(buf, "%d\n", bd->props->power);
+       if (likely(bd->props && bd->props->get_power))
+               rc = sprintf(buf, "%d\n", bd->props->get_power(bd));
+       else
+               rc = -ENXIO;
        up(&bd->sem);
 
        return rc;
@@ -29,25 +31,21 @@ 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 = -ENXIO;
+       int rc, power;
        char *endp;
        struct backlight_device *bd = to_backlight_device(cdev);
-       int power = simple_strtoul(buf, &endp, 0);
-       size_t size = endp - buf;
 
-       if (*endp && isspace(*endp))
-               size++;
-       if (size != count)
+       power = simple_strtoul(buf, &endp, 0);
+       if (*endp && !isspace(*endp))
                return -EINVAL;
 
        down(&bd->sem);
-       if (likely(bd->props)) {
+       if (likely(bd->props && bd->props->set_power)) {
                pr_debug("backlight: set power to %d\n", power);
-               bd->props->power = power;
-               if (likely(bd->props->update_status))
-                       bd->props->update_status(bd);
+               bd->props->set_power(bd, power);
                rc = count;
-       }
+       } else
+               rc = -ENXIO;
        up(&bd->sem);
 
        return rc;
@@ -55,12 +53,14 @@ 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 = -ENXIO;
+       int rc;
        struct backlight_device *bd = to_backlight_device(cdev);
 
        down(&bd->sem);
-       if (likely(bd->props))
-               rc = sprintf(buf, "%d\n", bd->props->brightness);
+       if (likely(bd->props && bd->props->get_brightness))
+               rc = sprintf(buf, "%d\n", bd->props->get_brightness(bd));
+       else
+               rc = -ENXIO;
        up(&bd->sem);
 
        return rc;
@@ -68,30 +68,21 @@ 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 = -ENXIO;
+       int rc, brightness;
        char *endp;
        struct backlight_device *bd = to_backlight_device(cdev);
-       int brightness = simple_strtoul(buf, &endp, 0);
-       size_t size = endp - buf;
 
-       if (*endp && isspace(*endp))
-               size++;
-       if (size != count)
+       brightness = simple_strtoul(buf, &endp, 0);
+       if (*endp && !isspace(*endp))
                return -EINVAL;
 
        down(&bd->sem);
-       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;
-               }
-       }
+       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;
        up(&bd->sem);
 
        return rc;
@@ -99,26 +90,14 @@ 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 = -ENXIO;
+       int rc;
        struct backlight_device *bd = to_backlight_device(cdev);
 
        down(&bd->sem);
        if (likely(bd->props))
                rc = sprintf(buf, "%d\n", bd->props->max_brightness);
-       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));
+       else
+               rc = -ENXIO;
        up(&bd->sem);
 
        return rc;
@@ -144,10 +123,7 @@ 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(actual_brightness, 0444, backlight_show_actual_brightness,
-                    NULL),
+       DECLARE_ATTR(brightness, 0644, backlight_show_brightness, backlight_store_brightness),
        DECLARE_ATTR(max_brightness, 0444, backlight_show_max_brightness, NULL),
 };
 
@@ -168,12 +144,8 @@ 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->fb_blank = *(int *)evdata->data;
-                       if (likely(bd->props && bd->props->update_status))
-                               bd->props->update_status(bd);
-               }
+               if (!bd->props->check_fb || bd->props->check_fb(evdata->info))
+                       bd->props->set_power(bd, *(int *)evdata->data);
        up(&bd->sem);
        return 0;
 }
@@ -259,12 +231,6 @@ 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);