[PATCH] leds: Drop BUG_ON check for LED_COLOR_ID_MULTI

[PATCH] leds: Drop BUG_ON check for LED_COLOR_ID_MULTI

[Marek Behún]

Commit c3f853184bed ("leds: Fix BUG_ON check for LED_COLOR_ID_MULTI that
is always false") fixed a no-op BUG_ON. This turned out to cause a
regression, since some in-tree device-tree files already use
LED_COLOR_ID_MULTI.

Drop the BUG_ON altogether.

Fixes: c3f853184bed ("leds: Fix BUG_ON check for LED_COLOR_ID_MULTI that is always false")
Reported-by: Da Xue <da@libre.computer>
Closes: https://lore.kernel.org/linux-leds/ZQLelWcNjjp2xndY@duo.ucw.cz/T/
Signed-off-by: Marek Behún <kabel@kernel.org>
---
 drivers/leds/led-core.c | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/drivers/leds/led-core.c b/drivers/leds/led-core.c
index 04f9ea675f2c..214ed81eb0e9 100644
--- a/drivers/leds/led-core.c
+++ b/drivers/leds/led-core.c
@@ -479,10 +479,6 @@ int led_compose_name(struct device *dev, struct led_init_data *init_data,
 
 	led_parse_fwnode_props(dev, fwnode, &props);
 
-	/* We want to label LEDs that can produce full range of colors
-	 * as RGB, not multicolor */
-	BUG_ON(props.color == LED_COLOR_ID_MULTI);
-
 	if (props.label) {
 		/*
 		 * If init_data.devicename is NULL, then it indicates that
-- 
2.41.0

Re: [PATCH] leds: Drop BUG_ON check for LED_COLOR_ID_MULTI

[Marek Behún]

Hello,

Greg tells me to pester LED maintainers to get this into Linus' tree
soon, so that we can avoid stable incosistencies (see
https://lore.kernel.org/stable/2023091901-vessel-giggling-55ee@gregkh/).

Sorry about the inconvenience, this would not happen if this was not
sent into stable in the first place, which is my fault, since I added
the Fixes tag.

Marek

Re: [PATCH] leds: Drop BUG_ON check for LED_COLOR_ID_MULTI

[Pavel Machek]

[-- Attachment #1: Type: text/plain, Size: 732 bytes --]

Hi!

> Greg tells me to pester LED maintainers to get this into Linus' tree
> soon, so that we can avoid stable incosistencies (see
> https://lore.kernel.org/stable/2023091901-vessel-giggling-55ee@gregkh/).
> 
> Sorry about the inconvenience, this would not happen if this was not
> sent into stable in the first place, which is my fault, since I added
> the Fixes tag.

Actually, no, it is not your fault. It was pretty clear your patch is
not "fixing serious bug" so it should not have gone into stable in the
first place.

For mainline, should we perhaps keep the BUG_ON and fix the affected
driver, instead?

Best regards,
								Pavel
-- 
People of Russia, stop Putin before his war on Ukraine escalates.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 195 bytes --]

Re: [PATCH] leds: Drop BUG_ON check for LED_COLOR_ID_MULTI

[Pavel Machek]

[-- Attachment #1: Type: text/plain, Size: 850 bytes --]

Hi!

> > Greg tells me to pester LED maintainers to get this into Linus' tree
> > soon, so that we can avoid stable incosistencies (see
> > https://lore.kernel.org/stable/2023091901-vessel-giggling-55ee@gregkh/).
> > 
> > Sorry about the inconvenience, this would not happen if this was not
> > sent into stable in the first place, which is my fault, since I added
> > the Fixes tag.
> 
> Actually, no, it is not your fault. It was pretty clear your patch is
> not "fixing serious bug" so it should not have gone into stable in the
> first place.
> 
> For mainline, should we perhaps keep the BUG_ON and fix the affected
> driver, instead?

Aha, rereading the discussion.. yes, we want to drop the BUG_ON. Sorry
for the noise.

Best regards,
								Pavel
-- 
People of Russia, stop Putin before his war on Ukraine escalates.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 195 bytes --]

Re: [PATCH] leds: Drop BUG_ON check for LED_COLOR_ID_MULTI

[Lee Jones]

On Tue, 19 Sep 2023, Marek Behún wrote:

> Hello,
> 
> Greg tells me to pester LED maintainers to get this into Linus' tree
> soon, so that we can avoid stable incosistencies (see
> https://lore.kernel.org/stable/2023091901-vessel-giggling-55ee@gregkh/).
> 
> Sorry about the inconvenience, this would not happen if this was not
> sent into stable in the first place, which is my fault, since I added
> the Fixes tag.

Starting back on upstream work now.

I'll get something out shortly.

-- 
Lee Jones [李琼斯]

Re: (subset) [PATCH] leds: Drop BUG_ON check for LED_COLOR_ID_MULTI

[Lee Jones]

On Mon, 18 Sep 2023 16:07:24 +0200, Marek Behún wrote:
> Commit c3f853184bed ("leds: Fix BUG_ON check for LED_COLOR_ID_MULTI that
> is always false") fixed a no-op BUG_ON. This turned out to cause a
> regression, since some in-tree device-tree files already use
> LED_COLOR_ID_MULTI.
> 
> Drop the BUG_ON altogether.
> 
> [...]

Applied, thanks!

[1/1] leds: Drop BUG_ON check for LED_COLOR_ID_MULTI
      commit: 9dc1664fab2246bc2c3e9bf2cf21518a857f9b5b

--
Lee Jones [李琼斯]