[PATCH] leds: Expand led_colors[] array

[PATCH] leds: Expand led_colors[] array

[Jisheng Zhang]

commit 472d7b9e8141 ("dt-bindings: leds: Expand LED_COLOR_ID
definitions") expands LED_COLOR_ID definitions for dt-binding. However,
it doesn't expand the led_colors[] array in leds core, so if any of
the newly expaned LED_COLOR_ID definitions is used, the sysfs will
emit null in the led's name color part. Let's expand the led_colors[]
array too.

Before the commit:
/sys/class/leds # ls
(null):indicator-0

After the commit:
/sys/class/leds # ls
orange:indicator-0

Signed-off-by: Jisheng Zhang <jszhang@kernel.org>
---
 drivers/leds/led-core.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/drivers/leds/led-core.c b/drivers/leds/led-core.c
index 04f9ea675f2c..742595d923ee 100644
--- a/drivers/leds/led-core.c
+++ b/drivers/leds/led-core.c
@@ -36,6 +36,11 @@ const char * const led_colors[LED_COLOR_ID_MAX] = {
 	[LED_COLOR_ID_IR] = "ir",
 	[LED_COLOR_ID_MULTI] = "multicolor",
 	[LED_COLOR_ID_RGB] = "rgb",
+	[LED_COLOR_ID_PURPLE] = "purple",
+	[LED_COLOR_ID_ORANGE] = "orange",
+	[LED_COLOR_ID_PINK] = "pink",
+	[LED_COLOR_ID_CYAN] = "cyan",
+	[LED_COLOR_ID_LIME] = "lime",
 };
 EXPORT_SYMBOL_GPL(led_colors);
 
-- 
2.40.1

Re: [PATCH] leds: Expand led_colors[] array

[Lee Jones]

On Mon, 30 Oct 2023, Jisheng Zhang wrote:

> commit 472d7b9e8141 ("dt-bindings: leds: Expand LED_COLOR_ID
> definitions") expands LED_COLOR_ID definitions for dt-binding. However,
> it doesn't expand the led_colors[] array in leds core, so if any of
> the newly expaned LED_COLOR_ID definitions is used, the sysfs will
> emit null in the led's name color part. Let's expand the led_colors[]
> array too.
> 
> Before the commit:
> /sys/class/leds # ls
> (null):indicator-0
> 
> After the commit:
> /sys/class/leds # ls
> orange:indicator-0
> 
> Signed-off-by: Jisheng Zhang <jszhang@kernel.org>
> ---
>  drivers/leds/led-core.c | 5 +++++
>  1 file changed, 5 insertions(+)

This already exists as:

  a067943129b4e leds: core: Add more colors from DT bindings to led_colors

-- 
Lee Jones [李琼斯]

Re: [PATCH] leds: Expand led_colors[] array

[Jisheng Zhang]

On Thu, Nov 23, 2023 at 10:56:20AM +0000, Lee Jones wrote:
> On Mon, 30 Oct 2023, Jisheng Zhang wrote:
> 
> > commit 472d7b9e8141 ("dt-bindings: leds: Expand LED_COLOR_ID
> > definitions") expands LED_COLOR_ID definitions for dt-binding. However,
> > it doesn't expand the led_colors[] array in leds core, so if any of
> > the newly expaned LED_COLOR_ID definitions is used, the sysfs will
> > emit null in the led's name color part. Let's expand the led_colors[]
> > array too.
> > 
> > Before the commit:
> > /sys/class/leds # ls
> > (null):indicator-0
> > 
> > After the commit:
> > /sys/class/leds # ls
> > orange:indicator-0
> > 
> > Signed-off-by: Jisheng Zhang <jszhang@kernel.org>
> > ---
> >  drivers/leds/led-core.c | 5 +++++
> >  1 file changed, 5 insertions(+)
> 
> This already exists as:
> 
>   a067943129b4e leds: core: Add more colors from DT bindings to led_colors

well, my patch was sent earlier than this one... When I sent out the
patch there's neither fix in mailist nor in your repo.

Re: [PATCH] leds: Expand led_colors[] array

[Lee Jones]

On Mon, 27 Nov 2023, Jisheng Zhang wrote:

> On Thu, Nov 23, 2023 at 10:56:20AM +0000, Lee Jones wrote:
> > On Mon, 30 Oct 2023, Jisheng Zhang wrote:
> > 
> > > commit 472d7b9e8141 ("dt-bindings: leds: Expand LED_COLOR_ID
> > > definitions") expands LED_COLOR_ID definitions for dt-binding. However,
> > > it doesn't expand the led_colors[] array in leds core, so if any of
> > > the newly expaned LED_COLOR_ID definitions is used, the sysfs will
> > > emit null in the led's name color part. Let's expand the led_colors[]
> > > array too.
> > > 
> > > Before the commit:
> > > /sys/class/leds # ls
> > > (null):indicator-0
> > > 
> > > After the commit:
> > > /sys/class/leds # ls
> > > orange:indicator-0
> > > 
> > > Signed-off-by: Jisheng Zhang <jszhang@kernel.org>
> > > ---
> > >  drivers/leds/led-core.c | 5 +++++
> > >  1 file changed, 5 insertions(+)
> > 
> > This already exists as:
> > 
> >   a067943129b4e leds: core: Add more colors from DT bindings to led_colors
> 
> well, my patch was sent earlier than this one... When I sent out the
> patch there's neither fix in mailist nor in your repo.

What makes you think that?

The applied patch was submitted 8th October.

https://lore.kernel.org/all/20231008144014.1180334-1-megi@xff.cz/

Yours was submitted 30th October, 3 weeks later.

https://lore.kernel.org/all/20231030054757.3476-1-jszhang@kernel.org/

-- 
Lee Jones [李琼斯]