[PATCH v2] led: try to get LED's label from the 'label' property

[PATCH v2] led: try to get LED's label from the 'label' property

[Antony Pavlov]

Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com>
---
 drivers/led/led-gpio.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/drivers/led/led-gpio.c b/drivers/led/led-gpio.c
index 7bb3b49..b36f629 100644
--- a/drivers/led/led-gpio.c
+++ b/drivers/led/led-gpio.c
@@ -206,13 +206,18 @@ static int led_gpio_of_probe(struct device_d *dev)
 		struct gpio_led *gled;
 		enum of_gpio_flags flags;
 		int gpio;
+		const char *label;
 
 		gpio = of_get_named_gpio_flags(child, "gpios", 0, &flags);
 		if (gpio < 0)
 			continue;
 
 		gled = xzalloc(sizeof(*gled));
-		gled->led.name = xstrdup(child->name);
+		label = of_get_property(child, "label", NULL);
+		if (!label)
+			label = child->name;
+		gled->led.name = xstrdup(label);
+
 		gled->gpio = gpio;
 		gled->active_low = (flags & OF_GPIO_ACTIVE_LOW) ? 1 : 0;
 
-- 
2.0.1


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

Re: [PATCH v2] led: try to get LED's label from the 'label' property

[Sebastian Hesselbarth]

On 07/28/2014 11:22 PM, Antony Pavlov wrote:

I personally _always_ prefer a commit message...

> Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com>
> ---
>  drivers/led/led-gpio.c | 7 ++++++-
>  1 file changed, 6 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/led/led-gpio.c b/drivers/led/led-gpio.c
> index 7bb3b49..b36f629 100644
> --- a/drivers/led/led-gpio.c
> +++ b/drivers/led/led-gpio.c
> @@ -206,13 +206,18 @@ static int led_gpio_of_probe(struct device_d *dev)
>  		struct gpio_led *gled;
>  		enum of_gpio_flags flags;
>  		int gpio;
> +		const char *label;
>  
>  		gpio = of_get_named_gpio_flags(child, "gpios", 0, &flags);
>  		if (gpio < 0)
>  			continue;
>  
>  		gled = xzalloc(sizeof(*gled));
> -		gled->led.name = xstrdup(child->name);
> +		label = of_get_property(child, "label", NULL);

of_property_read_string() ?

Sebastian

> +		if (!label)
> +			label = child->name;
> +		gled->led.name = xstrdup(label);
> +
>  		gled->gpio = gpio;
>  		gled->active_low = (flags & OF_GPIO_ACTIVE_LOW) ? 1 : 0;
>  
> 


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox