linux-leds.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 1/3] leds: triggers: add support for RGB triggers
@ 2016-03-13 17:14 Heiner Kallweit
  2016-03-17 13:41 ` Jacek Anaszewski
  0 siblings, 1 reply; 18+ messages in thread
From: Heiner Kallweit @ 2016-03-13 17:14 UTC (permalink / raw)
  To: Jacek Anaszewski; +Cc: linux-leds@vger.kernel.org

Add basic support for RGB triggers. Triggers with flag LED_TRIG_CAP_RGB
set are available to RGB LED devices only.

Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
---
 drivers/leds/led-triggers.c | 15 ++++++++++++---
 include/linux/leds.h        |  3 +++
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/drivers/leds/led-triggers.c b/drivers/leds/led-triggers.c
index 2181581..3ccf88b 100644
--- a/drivers/leds/led-triggers.c
+++ b/drivers/leds/led-triggers.c
@@ -30,6 +30,13 @@ static LIST_HEAD(trigger_list);
 
  /* Used by LED Class */
 
+static inline bool led_trig_check_rgb(struct led_trigger *trig,
+				      struct led_classdev *led_cdev)
+{
+	return !(trig->flags & LED_TRIG_CAP_RGB) ||
+	       led_cdev->flags & LED_DEV_CAP_RGB;
+}
+
 ssize_t led_trigger_store(struct device *dev, struct device_attribute *attr,
 		const char *buf, size_t count)
 {
@@ -52,12 +59,12 @@ ssize_t led_trigger_store(struct device *dev, struct device_attribute *attr,
 	down_read(&triggers_list_lock);
 	list_for_each_entry(trig, &trigger_list, next_trig) {
 		if (sysfs_streq(buf, trig->name)) {
+			if (!led_trig_check_rgb(trig, led_cdev))
+				break;
 			down_write(&led_cdev->trigger_lock);
 			led_trigger_set(led_cdev, trig);
 			up_write(&led_cdev->trigger_lock);
-
-			up_read(&triggers_list_lock);
-			goto unlock;
+			break;
 		}
 	}
 	up_read(&triggers_list_lock);
@@ -84,6 +91,8 @@ ssize_t led_trigger_show(struct device *dev, struct device_attribute *attr,
 		len += sprintf(buf+len, "none ");
 
 	list_for_each_entry(trig, &trigger_list, next_trig) {
+		if (!led_trig_check_rgb(trig, led_cdev))
+			continue;
 		if (led_cdev->trigger && !strcmp(led_cdev->trigger->name,
 							trig->name))
 			len += sprintf(buf+len, "[%s] ", trig->name);
diff --git a/include/linux/leds.h b/include/linux/leds.h
index 58e22e6..07eb074 100644
--- a/include/linux/leds.h
+++ b/include/linux/leds.h
@@ -248,6 +248,9 @@ enum led_brightness led_hsv_to_rgb(enum led_brightness hsv);
 struct led_trigger {
 	/* Trigger Properties */
 	const char	 *name;
+	u8		flags;
+#define LED_TRIG_CAP_RGB	BIT(0)
+
 	void		(*activate)(struct led_classdev *led_cdev);
 	void		(*deactivate)(struct led_classdev *led_cdev);
 
-- 
2.7.2

^ permalink raw reply related	[flat|nested] 18+ messages in thread

end of thread, other threads:[~2016-03-24 21:33 UTC | newest]

Thread overview: 18+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-03-13 17:14 [PATCH 1/3] leds: triggers: add support for RGB triggers Heiner Kallweit
2016-03-17 13:41 ` Jacek Anaszewski
2016-03-17 19:53   ` Heiner Kallweit
2016-03-18 13:10     ` Jacek Anaszewski
2016-03-19 19:11       ` Heiner Kallweit
2016-03-21 15:35         ` Jacek Anaszewski
2016-03-21 17:34           ` Heiner Kallweit
2016-03-22  8:05             ` Jacek Anaszewski
2016-03-22 11:47               ` Heiner Kallweit
2016-03-22 16:00                 ` Jacek Anaszewski
2016-03-22 22:06                   ` Heiner Kallweit
2016-03-23  8:32                     ` Jacek Anaszewski
2016-03-23 11:57                       ` Heiner Kallweit
2016-03-23 16:02                         ` Jacek Anaszewski
2016-03-23 16:36                           ` Heiner Kallweit
2016-03-24 13:23                             ` Jacek Anaszewski
2016-03-24 15:44                               ` Heiner Kallweit
2016-03-24 21:32                                 ` Jacek Anaszewski

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).