[ARM] pxa/spitz: use leds-gpio for led driving and drop leds-spitz

[safe/jmp/linux-2.6] / drivers / leds / led-class.c

diff --git a/drivers/leds/led-class.c b/drivers/leds/led-class.c
index 63aad90..559a408 100644 (file)
--- a/drivers/leds/led-class.c
+++ b/drivers/leds/led-class.c
@@ -24,6 +24,12 @@
 
 static struct class *leds_class;
 
+static void led_update_brightness(struct led_classdev *led_cdev)
+{
+       if (led_cdev->brightness_get)
+               led_cdev->brightness = led_cdev->brightness_get(led_cdev);
+}
+
 static ssize_t led_brightness_show(struct device *dev, 
                struct device_attribute *attr, char *buf)
 {
@@ -31,6 +37,7 @@ static ssize_t led_brightness_show(struct device *dev,
        ssize_t ret = 0;
 
        /* no lock needed for this */
+       led_update_brightness(led_cdev);
        sprintf(buf, "%u\n", led_cdev->brightness);
        ret = strlen(buf) + 1;
 
@@ -51,6 +58,9 @@ static ssize_t led_brightness_store(struct device *dev,
 
        if (count == size) {
                ret = count;
+
+               if (state == LED_OFF)
+                       led_trigger_remove(led_cdev);
                led_set_brightness(led_cdev, state);
        }
 
@@ -93,13 +103,11 @@ int led_classdev_register(struct device *parent, struct led_classdev *led_cdev)
 {
        int rc;
 
-       led_cdev->dev = device_create(leds_class, parent, 0, "%s",
-                                           led_cdev->name);
-       if (unlikely(IS_ERR(led_cdev->dev)))
+       led_cdev->dev = device_create_drvdata(leds_class, parent, 0, led_cdev,
+                                             "%s", led_cdev->name);
+       if (IS_ERR(led_cdev->dev))
                return PTR_ERR(led_cdev->dev);
 
-       dev_set_drvdata(led_cdev->dev, led_cdev);
-
        /* register the attributes */
        rc = device_create_file(led_cdev->dev, &dev_attr_brightness);
        if (rc)
@@ -110,6 +118,8 @@ int led_classdev_register(struct device *parent, struct led_classdev *led_cdev)
        list_add_tail(&led_cdev->node, &leds_list);
        up_write(&leds_list_lock);
 
+       led_update_brightness(led_cdev);
+
 #ifdef CONFIG_LEDS_TRIGGERS
        init_rwsem(&led_cdev->trigger_lock);