Commit b0bb83df authored Sep 26, 2013 by Josh Wu Committed by Bryan Wu Oct 25, 2013

leds-gpio: of: led should not be created if its status is disabled



now the leds-gpio driver will create every child led node without
checking the status is disabled or not.

for example, if we have a led node like d3, and its status is disabled:
	leds {
		d3 {
			label = "d3";
			gpios = <&pioE 24 0>;
			status = "disabled";
		};
	};

we except the d3 should not be created. And the gpios should not be
request as well.

But current driver will create d3 and request its gpio.

This patch fix this by using for_each_available_child_of_node() and
of_get_available_child_count() to enumerate all child nodes. So the
disabled node will be inavailable.

Signed-off-by: Josh Wu <josh.wu@atmel.com>
Signed-off-by: Bryan Wu <cooloney@gmail.com>

parent 954e04b9

drivers/leds/leds-gpio.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -171,11 +171,11 @@ static struct gpio_leds_priv gpio_leds_create_of(struct platform_device pdev)
		int count, ret;

		/* count LEDs in this device, so we know how much to allocate */
		count = of_get_child_count(np);
		count = of_get_available_child_count(np);
		if (!count)
		return ERR_PTR(-ENODEV);

		for_each_child_of_node(np, child)
		for_each_available_child_of_node(np, child)
		if (of_get_gpio(child, 0) == -EPROBE_DEFER)
		return ERR_PTR(-EPROBE_DEFER);

		@@ -184,7 +184,7 @@ static struct gpio_leds_priv gpio_leds_create_of(struct platform_device pdev)
		if (!priv)
		return ERR_PTR(-ENOMEM);

		for_each_child_of_node(np, child) {
		for_each_available_child_of_node(np, child) {
		struct gpio_led led = {};
		enum of_gpio_flags flags;
		const char *state;

Admin message