i2c-pxa: only define 'blue_murder'-function if DEBUG is #defined

[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 ac05a92..69e7d86 100644 (file)
--- a/drivers/leds/led-class.c
+++ b/drivers/leds/led-class.c
@@ -34,14 +34,11 @@ static ssize_t led_brightness_show(struct device *dev,
                struct device_attribute *attr, char *buf)
 {
        struct led_classdev *led_cdev = dev_get_drvdata(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;
 
-       return ret;
+       return sprintf(buf, "%u\n", led_cdev->brightness);
 }
 
 static ssize_t led_brightness_store(struct device *dev,
@@ -53,7 +50,7 @@ static ssize_t led_brightness_store(struct device *dev,
        unsigned long state = simple_strtoul(buf, &after, 10);
        size_t count = after - buf;
 
-       if (*after && isspace(*after))
+       if (isspace(*after))
                count++;
 
        if (count == size) {
@@ -67,10 +64,22 @@ static ssize_t led_brightness_store(struct device *dev,
        return ret;
 }
 
-static DEVICE_ATTR(brightness, 0644, led_brightness_show, led_brightness_store);
+static ssize_t led_max_brightness_show(struct device *dev,
+               struct device_attribute *attr, char *buf)
+{
+       struct led_classdev *led_cdev = dev_get_drvdata(dev);
+
+       return sprintf(buf, "%u\n", led_cdev->max_brightness);
+}
+
+static struct device_attribute led_class_attrs[] = {
+       __ATTR(brightness, 0644, led_brightness_show, led_brightness_store),
+       __ATTR(max_brightness, 0644, led_max_brightness_show, NULL),
 #ifdef CONFIG_LEDS_TRIGGERS
-static DEVICE_ATTR(trigger, 0644, led_trigger_show, led_trigger_store);
+       __ATTR(trigger, 0644, led_trigger_show, led_trigger_store),
 #endif
+       __ATTR_NULL,
+};
 
 /**
  * led_classdev_suspend - suspend an led_classdev.
@@ -94,71 +103,72 @@ void led_classdev_resume(struct led_classdev *led_cdev)
 }
 EXPORT_SYMBOL_GPL(led_classdev_resume);
 
+static int led_suspend(struct device *dev, pm_message_t state)
+{
+       struct led_classdev *led_cdev = dev_get_drvdata(dev);
+
+       if (led_cdev->flags & LED_CORE_SUSPENDRESUME)
+               led_classdev_suspend(led_cdev);
+
+       return 0;
+}
+
+static int led_resume(struct device *dev)
+{
+       struct led_classdev *led_cdev = dev_get_drvdata(dev);
+
+       if (led_cdev->flags & LED_CORE_SUSPENDRESUME)
+               led_classdev_resume(led_cdev);
+
+       return 0;
+}
+
 /**
  * led_classdev_register - register a new object of led_classdev class.
- * @dev: The device to register.
+ * @parent: The device to register.
  * @led_cdev: the led_classdev structure for this device.
  */
 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(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)
-               goto err_out;
-
+#ifdef CONFIG_LEDS_TRIGGERS
+       init_rwsem(&led_cdev->trigger_lock);
+#endif
        /* add to the list of leds */
        down_write(&leds_list_lock);
        list_add_tail(&led_cdev->node, &leds_list);
        up_write(&leds_list_lock);
 
+       if (!led_cdev->max_brightness)
+               led_cdev->max_brightness = LED_FULL;
+
        led_update_brightness(led_cdev);
 
 #ifdef CONFIG_LEDS_TRIGGERS
-       init_rwsem(&led_cdev->trigger_lock);
-
-       rc = device_create_file(led_cdev->dev, &dev_attr_trigger);
-       if (rc)
-               goto err_out_led_list;
-
        led_trigger_set_default(led_cdev);
 #endif
 
-       printk(KERN_INFO "Registered led device: %s\n",
+       printk(KERN_DEBUG "Registered led device: %s\n",
                        led_cdev->name);
 
        return 0;
-
-#ifdef CONFIG_LEDS_TRIGGERS
-err_out_led_list:
-       device_remove_file(led_cdev->dev, &dev_attr_brightness);
-       list_del(&led_cdev->node);
-#endif
-err_out:
-       device_unregister(led_cdev->dev);
-       return rc;
 }
+
 EXPORT_SYMBOL_GPL(led_classdev_register);
 
 /**
- * __led_classdev_unregister - unregisters a object of led_properties class.
+ * led_classdev_unregister - unregisters a object of led_properties class.
  * @led_cdev: the led device to unregister
  *
  * Unregisters a previously registered via led_classdev_register object.
  */
 void led_classdev_unregister(struct led_classdev *led_cdev)
 {
-       device_remove_file(led_cdev->dev, &dev_attr_brightness);
 #ifdef CONFIG_LEDS_TRIGGERS
-       device_remove_file(led_cdev->dev, &dev_attr_trigger);
        down_write(&led_cdev->trigger_lock);
        if (led_cdev->trigger)
                led_trigger_set(led_cdev, NULL);
@@ -178,6 +188,9 @@ static int __init leds_init(void)
        leds_class = class_create(THIS_MODULE, "leds");
        if (IS_ERR(leds_class))
                return PTR_ERR(leds_class);
+       leds_class->suspend = led_suspend;
+       leds_class->resume = led_resume;
+       leds_class->dev_attrs = led_class_attrs;
        return 0;
 }