Skip to contentSkip to conversation

LED: Add LED Trigger Support

PATCH In review Richard Purdie 1 participant 2 messages Feb 5, 2006 – Feb 8, 2006 LED

lore
Share & tools
lore
#0 lore raw

PATCH 3/12 LED: Add LED Trigger Support

Add support for LED triggers to the LED subsystem. "Triggers" are events which change the state of an LED. Two kinds of trigger are available, simple ones which can be added to exising code with minimum disruption and complex ones for implementing new or more complex functionality.

drivers/leds/Kconfig +8 -0
Index: linux-2.6.15/drivers/leds/Kconfig
===================================================================
@@ -14,5 +14,13 @@
 	  This option enables the led sysfs class in /sys/class/leds.  You'll
 	  need this to do anything useful with LEDs.  If unsure, say N.
 
+config LEDS_TRIGGERS
+	bool "LED Trigger support"
+	depends NEW_LEDS
+	help
+	  This option enables trigger support for the leds class.
+	  These triggers allow kernel events to drive the LEDs and can
+	  be configured via sysfs. If unsure, say Y.
+
 endmenu
 
drivers/leds/Makefile +1 -0
Index: linux-2.6.15/drivers/leds/Makefile
===================================================================
@@ -2,3 +2,4 @@
 # LED Core
 obj-$(CONFIG_NEW_LEDS)			+= led-core.o
 obj-$(CONFIG_LEDS_CLASS)		+= led-class.o
+obj-$(CONFIG_LEDS_TRIGGERS)		+= led-triggers.o
drivers/leds/leds.h +10 -0
Index: linux-2.6.15/drivers/leds/leds.h
===================================================================
@@ -24,3 +24,13 @@
 extern rwlock_t leds_list_lock;
 extern struct list_head leds_list;
 
+#ifdef CONFIG_LEDS_TRIGGERS
+void led_trigger_set_default(struct led_classdev *led_cdev);
+void led_trigger_set(struct led_classdev *led_cdev, struct led_trigger *trigger);
+#else
+#define led_trigger_set_default(x) do {} while(0)
+#define led_trigger_set(x, y) do {} while(0)
+#endif
+
+ssize_t led_trigger_store(struct class_device *dev, const char *buf, size_t count);
+ssize_t led_trigger_show(struct class_device *dev, char *buf);
include/linux/leds.h +49 -0

58 lines not on this page · raw message

drivers/leds/led-class.c +14 -0
Index: linux-2.6.15/drivers/leds/led-class.c
===================================================================
@@ -55,6 +55,9 @@
 
 static CLASS_DEVICE_ATTR(brightness, 0644, led_brightness_show, led_brightness_store);
 
+#ifdef CONFIG_LEDS_TRIGGERS
+static CLASS_DEVICE_ATTR(trigger, 0644, led_trigger_show, led_trigger_store);
+#endif
 
 /**
  * led_classdev_suspend - suspend an led_classdev.
@@ -96,12 +99,17 @@
 
 	/* register the attributes */
 	class_device_create_file(led_cdev->class_dev, &class_device_attr_brightness);
+#ifdef CONFIG_LEDS_TRIGGERS
+	class_device_create_file(led_cdev->class_dev, &class_device_attr_trigger);
+#endif
 
 	/* add to the list of leds */
 	write_lock(&leds_list_lock);
 	list_add_tail(&led_cdev->node, &leds_list);
 	write_unlock(&leds_list_lock);
 
+	led_trigger_set_default(led_cdev);
+
 	printk(KERN_INFO "Registered led device: %s\n", led_cdev->class_dev->class_id);
 
 	return 0;
@@ -116,6 +124,12 @@
 void led_classdev_unregister(struct led_classdev *led_cdev)
 {
 	class_device_remove_file(led_cdev->class_dev, &class_device_attr_brightness);
+#ifdef CONFIG_LEDS_TRIGGERS
+	class_device_remove_file(led_cdev->class_dev, &class_device_attr_trigger);
+#endif
+
+	if (led_cdev->trigger)
+		led_trigger_set(led_cdev, NULL);
 
 	class_device_unregister(led_cdev->class_dev);
 
drivers/leds/led-triggers.c new file +236 -0

236 lines not on this page · raw message

#1 lore raw

LED trigger support fixes.

Split the locking on struct led_classdev into LED and trigger sections to prevent potential deadlock.
Fix a bug introduced in -mm where leds.h can be included more than once causing compile errors.
Make use of class_get_devdata()

drivers/leds/led-class.c +10 -6
Index: linux-2.6.15/drivers/leds/led-class.c
===================================================================
@@ -106,18 +106,20 @@
 	class_device_create_file(led_cdev->class_dev,
 				&class_device_attr_brightness);
 
-#ifdef CONFIG_LEDS_TRIGGERS
-	class_device_create_file(led_cdev->class_dev,
-				&class_device_attr_trigger);
-#endif
-
 	/* add to the list of leds */
 	write_lock(&leds_list_lock);
 	list_add_tail(&led_cdev->node, &leds_list);
 	write_unlock(&leds_list_lock);
 
+#ifdef CONFIG_LEDS_TRIGGERS
+	rwlock_init(&led_cdev->trigger_lock);
+
 	led_trigger_set_default(led_cdev);
 
+	class_device_create_file(led_cdev->class_dev,
+				&class_device_attr_trigger);
+#endif
+
 	printk(KERN_INFO "Registered led device: %s\n",
 			led_cdev->class_dev->class_id);
 
@@ -138,10 +140,12 @@
 #ifdef CONFIG_LEDS_TRIGGERS
 	class_device_remove_file(led_cdev->class_dev,
 				&class_device_attr_trigger);
-#endif
 
+	write_lock(&led_cdev->trigger_lock);
 	if (led_cdev->trigger)
 		led_trigger_set(led_cdev, NULL);
+	write_unlock(&led_cdev->trigger_lock);
+#endif
 
 	class_device_unregister(led_cdev->class_dev);
 
drivers/leds/led-triggers.c +16 -17
Index: linux-2.6.15/drivers/leds/led-triggers.c
===================================================================
@@ -24,7 +24,7 @@
 #include "leds.h"
 
 /*
- * Nests outside led_cdev->lock
+ * Nests outside led_cdev->lock and led_cdev->trigger_lock
  */
 static rwlock_t triggers_list_lock = RW_LOCK_UNLOCKED;
 static LIST_HEAD(trigger_list);
@@ -32,7 +32,7 @@
 ssize_t led_trigger_store(struct class_device *dev, const char *buf,
 			size_t count)
 {
-	struct led_classdev *led_cdev = dev->class_data;
+	struct led_classdev *led_cdev = class_get_devdata(dev);
 	char trigger_name[TRIG_NAME_MAX];
 	struct led_trigger *trig;
 	size_t len;
@@ -45,18 +45,18 @@
 		trigger_name[len - 1] = '\0';
 
 	if (!strcmp(trigger_name, "none")) {
-		write_lock(&led_cdev->lock);
+		write_lock(&led_cdev->trigger_lock);
 		led_trigger_set(led_cdev, NULL);
-		write_unlock(&led_cdev->lock);
+		write_unlock(&led_cdev->trigger_lock);
 		return count;
 	}
 
 	read_lock(&triggers_list_lock);
 	list_for_each_entry(trig, &trigger_list, next_trig) {
 		if (!strcmp(trigger_name, trig->name)) {
-			write_lock(&led_cdev->lock);
+			write_lock(&led_cdev->trigger_lock);
 			led_trigger_set(led_cdev, trig);
-			write_unlock(&led_cdev->lock);
+			write_unlock(&led_cdev->trigger_lock);
 
 			read_unlock(&triggers_list_lock);
 			return count;
@@ -70,12 +70,12 @@
 
 ssize_t led_trigger_show(struct class_device *dev, char *buf)
 {
-	struct led_classdev *led_cdev = dev->class_data;
+	struct led_classdev *led_cdev = class_get_devdata(dev);
 	struct led_trigger *trig;
 	int len = 0;
 
 	read_lock(&triggers_list_lock);
-	read_lock(&led_cdev->lock);
+	read_lock(&led_cdev->trigger_lock);
 
 	if (!led_cdev->trigger)
 		len += sprintf(buf+len, "[none] ");
@@ -89,7 +89,7 @@
 		else
 			len += sprintf(buf+len, "%s ", trig->name);
 	}
-	read_unlock(&led_cdev->lock);
+	read_unlock(&led_cdev->trigger_lock);
 	read_unlock(&triggers_list_lock);
 
 	len += sprintf(len+buf, "\n");
@@ -116,7 +116,7 @@
 	read_unlock(&trigger->leddev_list_lock);
 }
 
-/* Caller must ensure led_cdev->lock held for write */
+/* Caller must ensure led_cdev->trigger_lock held */
 void led_trigger_set(struct led_classdev *led_cdev, struct led_trigger *trigger)
 {
 	/* Remove any existing trigger */
@@ -126,7 +126,6 @@
 		write_unlock(&led_cdev->trigger->leddev_list_lock);
 		if (led_cdev->trigger->deactivate)
 			led_cdev->trigger->deactivate(led_cdev);
-
 	}
 	if (trigger) {
 		write_lock(&trigger->leddev_list_lock);
@@ -146,12 +145,12 @@
 		return;
 
 	read_lock(&triggers_list_lock);
-	write_lock(&led_cdev->lock);
+	write_lock(&led_cdev->trigger_lock);
 	list_for_each_entry(trig, &trigger_list, next_trig) {
 		if (!strcmp(led_cdev->default_trigger, trig->name))
 			led_trigger_set(led_cdev, trig);
 	}
-	write_unlock(&led_cdev->lock);
+	write_unlock(&led_cdev->trigger_lock);
 	read_unlock(&triggers_list_lock);
 }
 
@@ -170,11 +169,11 @@
 	/* Register with any LEDs that have this as a default trigger */
 	read_lock(&leds_list_lock);
 	list_for_each_entry(led_cdev, &leds_list, node) {
-		write_lock(&led_cdev->lock);
+		write_lock(&led_cdev->trigger_lock);
 		if (!led_cdev->trigger && led_cdev->default_trigger &&
 			    !strcmp(led_cdev->default_trigger, trigger->name))
 			led_trigger_set(led_cdev, trigger);
-		write_unlock(&led_cdev->lock);
+		write_unlock(&led_cdev->trigger_lock);
 	}
 	read_unlock(&leds_list_lock);
 
@@ -206,10 +205,10 @@
 	/* Remove anyone actively using this trigger */
 	read_lock(&leds_list_lock);
 	list_for_each_entry(led_cdev, &leds_list, node) {
-		write_lock(&led_cdev->lock);
+		write_lock(&led_cdev->trigger_lock);
 		if (led_cdev->trigger == trigger)
 			led_trigger_set(led_cdev, NULL);
-		write_unlock(&led_cdev->lock);
+		write_unlock(&led_cdev->trigger_lock);
 	}
 	read_unlock(&leds_list_lock);
 }
include/linux/leds.h +11 -3
Index: linux-2.6.15/include/linux/leds.h
===================================================================
@@ -10,6 +10,9 @@
  *
  */
 
+#ifndef _LINUX_LEDS
+#define _LINUX_LEDS
+
 struct device;
 struct class_device;
 /*
@@ -36,16 +39,19 @@
 	/* LED Device linked list */
 	struct list_head node;
 
+	/* Protects the LED properties data above */
+	rwlock_t lock;
+
 	/* Trigger data */
 	char *default_trigger;
 #ifdef CONFIG_LEDS_TRIGGERS
+	rwlock_t trigger_lock;
+	/* Protects the trigger data below */
+
 	struct led_trigger *trigger;
 	struct list_head trig_list;
 	void *trigger_data;
 #endif
-
-	/* This protects the data in this structure */
-	rwlock_t lock;
 };
 
 extern int led_classdev_register(struct device *parent,
@@ -98,3 +104,5 @@
 #define led_trigger_event(x, y) do {} while(0)
 
 #endif
+
+#endif /* _LINUX_LEDS */