Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6

[karo-tx-linux.git] / include / linux / leds.h

diff --git a/include/linux/leds.h b/include/linux/leds.h
index 4617e75903b007b411788f0e5fb61156cfd95535..494bed7c2fc12f5133504daa7b4a2cc0e3b4b326 100644 (file)
--- a/include/linux/leds.h
+++ b/include/linux/leds.h
@@ -12,6 +12,8 @@
 #ifndef __LINUX_LEDS_H_INCLUDED
 #define __LINUX_LEDS_H_INCLUDED
 
+#include <linux/list.h>
+
 struct device;
 struct class_device;
 /*
@@ -19,39 +21,38 @@ struct class_device;
  */
 
 enum led_brightness {
-       LED_OFF = 0,
-       LED_HALF = 127,
-       LED_FULL = 255,
+       LED_OFF         = 0,
+       LED_HALF        = 127,
+       LED_FULL        = 255,
 };
 
 struct led_classdev {
-       const char *name;
-       int brightness;
-       int flags;
-#define LED_SUSPENDED       (1 << 0)
+       const char              *name;
+       int                      brightness;
+       int                      flags;
+
+#define LED_SUSPENDED          (1 << 0)
 
-       /* A function to set the brightness of the led */
-       void (*brightness_set)(struct led_classdev *led_cdev,
-                               enum led_brightness brightness);
+       /* Set LED brightness level */
+       void            (*brightness_set)(struct led_classdev *led_cdev,
+                                         enum led_brightness brightness);
 
-       struct class_device *class_dev;
-       /* LED Device linked list */
-       struct list_head node;
+       struct class_device     *class_dev;
+       struct list_head         node;                  /* LED Device list */
+       char                    *default_trigger;       /* Trigger to use */
 
-       /* Trigger data */
-       char *default_trigger;
 #ifdef CONFIG_LEDS_TRIGGERS
-       rwlock_t trigger_lock;
        /* Protects the trigger data below */
+       rwlock_t                 trigger_lock;
 
-       struct led_trigger *trigger;
-       struct list_head trig_list;
-       void *trigger_data;
+       struct led_trigger      *trigger;
+       struct list_head         trig_list;
+       void                    *trigger_data;
 #endif
 };
 
 extern int led_classdev_register(struct device *parent,
-                               struct led_classdev *led_cdev);
+                                struct led_classdev *led_cdev);
 extern void led_classdev_unregister(struct led_classdev *led_cdev);
 extern void led_classdev_suspend(struct led_classdev *led_cdev);
 extern void led_classdev_resume(struct led_classdev *led_cdev);
@@ -65,16 +66,16 @@ extern void led_classdev_resume(struct led_classdev *led_cdev);
 
 struct led_trigger {
        /* Trigger Properties */
-       const char *name;
-       void (*activate)(struct led_classdev *led_cdev);
-       void (*deactivate)(struct led_classdev *led_cdev);
+       const char       *name;
+       void            (*activate)(struct led_classdev *led_cdev);
+       void            (*deactivate)(struct led_classdev *led_cdev);
 
        /* LEDs under control by this trigger (for simple triggers) */
-       rwlock_t leddev_list_lock;
-       struct list_head led_cdevs;
+       rwlock_t          leddev_list_lock;
+       struct list_head  led_cdevs;
 
        /* Link to next registered trigger */
-       struct list_head next_trig;
+       struct list_head  next_trig;
 };
 
 /* Registration functions for complex triggers */