Linux LED subsystem development
 help / color / mirror / Atom feed
* [PATCH] leds: leds-gpio: Fix multiple instances registration when 'label' property is absent
@ 2014-12-03 17:34 Fabio Estevam
  2014-12-03 17:40 ` Grant Likely
  0 siblings, 1 reply; 2+ messages in thread
From: Fabio Estevam @ 2014-12-03 17:34 UTC (permalink / raw)
  To: cooloney
  Cc: rpurdie, jean-michel.hautbois, grant.likely, rafael.j.wysocki,
	mika.westerberg, linux-leds, Fabio Estevam

From: Fabio Estevam <fabio.estevam@freescale.com>

Since commit a43f2cbbb009f96 ("leds: leds-gpio: Make use of device property
API") it is no longer possible to register multiple gpio leds without passing
the 'label' property.

According to Documentation/devicetree/bindings/leds/common.txt:

"Optional properties for child nodes:
- label : The label for this LED.  If omitted, the label is
  taken from the node name (excluding the unit address)."

So retrieve the node name when the 'label' property is absent to keep the old
behaviour and fix this regression.

Reported-by: Jean-Michel Hautbois <jean-michel.hautbois@vodalys.com>
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
---
 drivers/leds/leds-gpio.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/drivers/leds/leds-gpio.c b/drivers/leds/leds-gpio.c
index fd53968..a635330 100644
--- a/drivers/leds/leds-gpio.c
+++ b/drivers/leds/leds-gpio.c
@@ -170,6 +170,7 @@ static struct gpio_leds_priv *gpio_leds_create(struct platform_device *pdev)
 	struct fwnode_handle *child;
 	struct gpio_leds_priv *priv;
 	int count, ret;
+	struct device_node *np;
 
 	count = device_get_child_node_count(dev);
 	if (!count)
@@ -189,7 +190,12 @@ static struct gpio_leds_priv *gpio_leds_create(struct platform_device *pdev)
 			goto err;
 		}
 
-		fwnode_property_read_string(child, "label", &led.name);
+		np = of_node(child);
+
+		if (fwnode_property_present(child, "label"))
+			fwnode_property_read_string(child, "label", &led.name);
+		else
+			led.name = np->name;
 		fwnode_property_read_string(child, "linux,default-trigger",
 					    &led.default_trigger);
 
-- 
1.9.1

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

* Re: [PATCH] leds: leds-gpio: Fix multiple instances registration when 'label' property is absent
  2014-12-03 17:34 [PATCH] leds: leds-gpio: Fix multiple instances registration when 'label' property is absent Fabio Estevam
@ 2014-12-03 17:40 ` Grant Likely
  0 siblings, 0 replies; 2+ messages in thread
From: Grant Likely @ 2014-12-03 17:40 UTC (permalink / raw)
  To: Fabio Estevam
  Cc: Bryan Wu, Richard Purdie, Jean-Michel Hautbois, Rafael J. Wysocki,
	Mika Westerberg, Linux LED Subsystem, Fabio Estevam

On Wed, Dec 3, 2014 at 5:34 PM, Fabio Estevam <festevam@gmail.com> wrote:
> From: Fabio Estevam <fabio.estevam@freescale.com>
>
> Since commit a43f2cbbb009f96 ("leds: leds-gpio: Make use of device property
> API") it is no longer possible to register multiple gpio leds without passing
> the 'label' property.
>
> According to Documentation/devicetree/bindings/leds/common.txt:
>
> "Optional properties for child nodes:
> - label : The label for this LED.  If omitted, the label is
>   taken from the node name (excluding the unit address)."
>
> So retrieve the node name when the 'label' property is absent to keep the old
> behaviour and fix this regression.
>
> Reported-by: Jean-Michel Hautbois <jean-michel.hautbois@vodalys.com>
> Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
> ---
>  drivers/leds/leds-gpio.c | 8 +++++++-
>  1 file changed, 7 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/leds/leds-gpio.c b/drivers/leds/leds-gpio.c
> index fd53968..a635330 100644
> --- a/drivers/leds/leds-gpio.c
> +++ b/drivers/leds/leds-gpio.c
> @@ -170,6 +170,7 @@ static struct gpio_leds_priv *gpio_leds_create(struct platform_device *pdev)
>         struct fwnode_handle *child;
>         struct gpio_leds_priv *priv;
>         int count, ret;
> +       struct device_node *np;
>
>         count = device_get_child_node_count(dev);
>         if (!count)
> @@ -189,7 +190,12 @@ static struct gpio_leds_priv *gpio_leds_create(struct platform_device *pdev)
>                         goto err;
>                 }
>
> -               fwnode_property_read_string(child, "label", &led.name);
> +               np = of_node(child);
> +
> +               if (fwnode_property_present(child, "label"))
> +                       fwnode_property_read_string(child, "label", &led.name);
> +               else
> +                       led.name = np->name;

np will be NULL when ACPI is used and that will break this driver.
Instead you need to use the construct:
                 fwnode_property_read_string(child, "label", &led.name);
                 if (IS_ENABLED(CONFIG_OF) && !led.name && np)
                         led.name = np->name;
                 if (!led.name)
                         error;

>                 fwnode_property_read_string(child, "linux,default-trigger",
>                                             &led.default_trigger);
>
> --
> 1.9.1
>

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

end of thread, other threads:[~2014-12-03 17:41 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-12-03 17:34 [PATCH] leds: leds-gpio: Fix multiple instances registration when 'label' property is absent Fabio Estevam
2014-12-03 17:40 ` Grant Likely

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