mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
* [PATCH] led/led-class: Handle LEDs with the same name
@ 2015-02-11 12:26 Ricardo Ribalda Delgado
  2015-02-12 19:48 ` Bryan Wu
  0 siblings, 1 reply; 18+ messages in thread
From: Ricardo Ribalda Delgado @ 2015-02-11 12:26 UTC (permalink / raw)
  To: Bryan Wu, Richard Purdie, linux-leds, linux-kernel
  Cc: Ricardo Ribalda Delgado

The current code expected that every LED had an unique name. This is a
legit expectation when the device tree can no be modified or extended.
But with device tree overlays this requirement can be easily broken.

This patch finds out if the name is already in use and adds the suffix
_1, _2... if not.

Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
---
 drivers/leds/led-class.c | 30 ++++++++++++++++++++++++++++--
 1 file changed, 28 insertions(+), 2 deletions(-)

diff --git a/drivers/leds/led-class.c b/drivers/leds/led-class.c
index dbeebac..b60f942 100644
--- a/drivers/leds/led-class.c
+++ b/drivers/leds/led-class.c
@@ -208,6 +208,13 @@ static const struct dev_pm_ops leds_class_dev_pm_ops = {
 	.resume         = led_resume,
 };
 
+static int match_child(struct device *dev, void *data)
+{
+	if (!dev_name(dev))
+		return 0;
+	return !strcmp(dev_name(dev), (char *)data);
+}
+
 /**
  * led_classdev_register - register a new object of led_classdev class.
  * @parent: The device to register.
@@ -215,9 +222,28 @@ static const struct dev_pm_ops leds_class_dev_pm_ops = {
  */
 int led_classdev_register(struct device *parent, struct led_classdev *led_cdev)
 {
+	char *name;
+	char *temp_name = NULL;
+	int i = 0;
+
+	do {
+		if (i == 0)
+			name = (char *)led_cdev->name;
+		else {
+			kfree(temp_name);
+			temp_name = kasprintf(GFP_KERNEL, "%s_%d",
+					      led_cdev->name, i);
+			if (!temp_name)
+				return -ENOMEM;
+			name = temp_name;
+		}
+
+		i++;
+	} while (device_find_child(parent, name, match_child));
+
 	led_cdev->dev = device_create_with_groups(leds_class, parent, 0,
-					led_cdev, led_cdev->groups,
-					"%s", led_cdev->name);
+					led_cdev, led_cdev->groups, name);
+	kfree(temp_name);
 	if (IS_ERR(led_cdev->dev))
 		return PTR_ERR(led_cdev->dev);
 
-- 
2.1.4


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

end of thread, other threads:[~2015-02-19 23:23 UTC | newest]

Thread overview: 18+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-02-11 12:26 [PATCH] led/led-class: Handle LEDs with the same name Ricardo Ribalda Delgado
2015-02-12 19:48 ` Bryan Wu
2015-02-12 20:45   ` Ricardo Ribalda Delgado
2015-02-13 10:11     ` Ricardo Ribalda Delgado
2015-02-17 22:34     ` Bryan Wu
2015-02-17 22:54       ` Ricardo Ribalda Delgado
2015-02-17 23:35         ` Bryan Wu
2015-02-17 23:47           ` Ricardo Ribalda Delgado
2015-02-17 23:59             ` Bryan Wu
2015-02-18  0:32               ` Ricardo Ribalda Delgado
2015-02-18  0:52                 ` Bryan Wu
2015-02-18  1:11                   ` Ricardo Ribalda Delgado
2015-02-18  1:36                     ` Bryan Wu
2015-02-18  6:55                       ` Ricardo Ribalda Delgado
2015-02-19 19:12                         ` Bryan Wu
2015-02-19 22:59                           ` Ricardo Ribalda Delgado
2015-02-19 23:15                   ` Josh Cartwright
2015-02-19 23:22                     ` Ricardo Ribalda Delgado

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®