* [PATCH] leds: core: Omit set_brightness error message for a LED supporting hw trigger only
@ 2024-04-05 20:58 Heiner Kallweit
2024-04-11 14:26 ` Lee Jones
0 siblings, 1 reply; 5+ messages in thread
From: Heiner Kallweit @ 2024-04-05 20:58 UTC (permalink / raw)
To: Pavel Machek, Lee Jones; +Cc: linux-leds@vger.kernel.org
If both set_brightness functions return -ENOTSUPP, then the LED doesn't
support setting a fixed brightness value, and the error message isn't
helpful. This can be the case e.g. for LEDs supporting a specific hw
trigger only.
Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
---
drivers/leds/led-core.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/leds/led-core.c b/drivers/leds/led-core.c
index 89c9806cc..9485f799f 100644
--- a/drivers/leds/led-core.c
+++ b/drivers/leds/led-core.c
@@ -127,7 +127,8 @@ static void set_brightness_delayed_set_brightness(struct led_classdev *led_cdev,
ret = __led_set_brightness(led_cdev, value);
if (ret == -ENOTSUPP)
ret = __led_set_brightness_blocking(led_cdev, value);
- if (ret < 0 &&
+ /* Don't emit error message if LED supports a hw trigger like netdev only */
+ if (ret < 0 && ret != -ENOTSUPP &&
/* LED HW might have been unplugged, therefore don't warn */
!(ret == -ENODEV && (led_cdev->flags & LED_UNREGISTERING) &&
(led_cdev->flags & LED_HW_PLUGGABLE)))
--
2.44.0
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH] leds: core: Omit set_brightness error message for a LED supporting hw trigger only
2024-04-05 20:58 [PATCH] leds: core: Omit set_brightness error message for a LED supporting hw trigger only Heiner Kallweit
@ 2024-04-11 14:26 ` Lee Jones
2024-04-11 14:27 ` Lee Jones
2024-04-11 20:46 ` Heiner Kallweit
0 siblings, 2 replies; 5+ messages in thread
From: Lee Jones @ 2024-04-11 14:26 UTC (permalink / raw)
To: Heiner Kallweit; +Cc: Pavel Machek, linux-leds@vger.kernel.org
On Fri, 05 Apr 2024, Heiner Kallweit wrote:
> If both set_brightness functions return -ENOTSUPP, then the LED doesn't
> support setting a fixed brightness value, and the error message isn't
> helpful. This can be the case e.g. for LEDs supporting a specific hw
> trigger only.
>
> Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
> ---
> drivers/leds/led-core.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/leds/led-core.c b/drivers/leds/led-core.c
> index 89c9806cc..9485f799f 100644
> --- a/drivers/leds/led-core.c
> +++ b/drivers/leds/led-core.c
> @@ -127,7 +127,8 @@ static void set_brightness_delayed_set_brightness(struct led_classdev *led_cdev,
> ret = __led_set_brightness(led_cdev, value);
> if (ret == -ENOTSUPP)
> ret = __led_set_brightness_blocking(led_cdev, value);
> - if (ret < 0 &&
> + /* Don't emit error message if LED supports a hw trigger like netdev only */
> + if (ret < 0 && ret != -ENOTSUPP &&
> /* LED HW might have been unplugged, therefore don't warn */
> !(ret == -ENODEV && (led_cdev->flags & LED_UNREGISTERING) &&
> (led_cdev->flags & LED_HW_PLUGGABLE)))
This function is already pretty messy.
How about something like:
static void set_brightness_delayed_set_brightness(struct led_classdev *led_cdev,
unsigned int value)
{
int ret;
ret = __led_set_brightness(led_cdev, value);
if (ret == -ENOTSUPP) {
ret = __led_set_brightness_blocking(led_cdev, value);
if (ret == -ENOTSUPP)
/* No back-end support to set a fixed brightness value */
return;
}
if (ret == -ENODEV && (led_cdev->flags & LED_UNREGISTERING))
/* LED HW might have been unplugged, therefore don't warn */
return;
if (ret < 0 && led_cdev->flags & LED_HW_PLUGGABLE)
dev_err(led_cdev->dev, "Setting an LED's brightness failed (%d)\n", ret);
}
--
Lee Jones [李琼斯]
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] leds: core: Omit set_brightness error message for a LED supporting hw trigger only
2024-04-11 14:26 ` Lee Jones
@ 2024-04-11 14:27 ` Lee Jones
2024-04-11 20:46 ` Heiner Kallweit
1 sibling, 0 replies; 5+ messages in thread
From: Lee Jones @ 2024-04-11 14:27 UTC (permalink / raw)
To: Heiner Kallweit; +Cc: Pavel Machek, linux-leds@vger.kernel.org
On Thu, 11 Apr 2024, Lee Jones wrote:
> On Fri, 05 Apr 2024, Heiner Kallweit wrote:
>
> > If both set_brightness functions return -ENOTSUPP, then the LED doesn't
> > support setting a fixed brightness value, and the error message isn't
> > helpful. This can be the case e.g. for LEDs supporting a specific hw
> > trigger only.
> >
> > Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
> > ---
> > drivers/leds/led-core.c | 3 ++-
> > 1 file changed, 2 insertions(+), 1 deletion(-)
> >
> > diff --git a/drivers/leds/led-core.c b/drivers/leds/led-core.c
> > index 89c9806cc..9485f799f 100644
> > --- a/drivers/leds/led-core.c
> > +++ b/drivers/leds/led-core.c
> > @@ -127,7 +127,8 @@ static void set_brightness_delayed_set_brightness(struct led_classdev *led_cdev,
> > ret = __led_set_brightness(led_cdev, value);
> > if (ret == -ENOTSUPP)
> > ret = __led_set_brightness_blocking(led_cdev, value);
> > - if (ret < 0 &&
> > + /* Don't emit error message if LED supports a hw trigger like netdev only */
> > + if (ret < 0 && ret != -ENOTSUPP &&
> > /* LED HW might have been unplugged, therefore don't warn */
> > !(ret == -ENODEV && (led_cdev->flags & LED_UNREGISTERING) &&
> > (led_cdev->flags & LED_HW_PLUGGABLE)))
>
> This function is already pretty messy.
>
> How about something like:
>
> static void set_brightness_delayed_set_brightness(struct led_classdev *led_cdev,
> unsigned int value)
> {
> int ret;
>
> ret = __led_set_brightness(led_cdev, value);
> if (ret == -ENOTSUPP) {
> ret = __led_set_brightness_blocking(led_cdev, value);
> if (ret == -ENOTSUPP)
> /* No back-end support to set a fixed brightness value */
> return;
> }
>
> if (ret == -ENODEV && (led_cdev->flags & LED_UNREGISTERING))
> /* LED HW might have been unplugged, therefore don't warn */
> return;
>
> if (ret < 0 && led_cdev->flags & LED_HW_PLUGGABLE)
> dev_err(led_cdev->dev, "Setting an LED's brightness failed (%d)\n", ret);
> }
If it looks reasonable to you, I'd e happy to submit it as a patch.
--
Lee Jones [李琼斯]
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] leds: core: Omit set_brightness error message for a LED supporting hw trigger only
2024-04-11 14:26 ` Lee Jones
2024-04-11 14:27 ` Lee Jones
@ 2024-04-11 20:46 ` Heiner Kallweit
2024-05-02 16:11 ` Lee Jones
1 sibling, 1 reply; 5+ messages in thread
From: Heiner Kallweit @ 2024-04-11 20:46 UTC (permalink / raw)
To: Lee Jones; +Cc: Pavel Machek, linux-leds@vger.kernel.org
On 11.04.2024 16:26, Lee Jones wrote:
> On Fri, 05 Apr 2024, Heiner Kallweit wrote:
>
>> If both set_brightness functions return -ENOTSUPP, then the LED doesn't
>> support setting a fixed brightness value, and the error message isn't
>> helpful. This can be the case e.g. for LEDs supporting a specific hw
>> trigger only.
>>
>> Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
>> ---
>> drivers/leds/led-core.c | 3 ++-
>> 1 file changed, 2 insertions(+), 1 deletion(-)
>>
>> diff --git a/drivers/leds/led-core.c b/drivers/leds/led-core.c
>> index 89c9806cc..9485f799f 100644
>> --- a/drivers/leds/led-core.c
>> +++ b/drivers/leds/led-core.c
>> @@ -127,7 +127,8 @@ static void set_brightness_delayed_set_brightness(struct led_classdev *led_cdev,
>> ret = __led_set_brightness(led_cdev, value);
>> if (ret == -ENOTSUPP)
>> ret = __led_set_brightness_blocking(led_cdev, value);
>> - if (ret < 0 &&
>> + /* Don't emit error message if LED supports a hw trigger like netdev only */
>> + if (ret < 0 && ret != -ENOTSUPP &&
>> /* LED HW might have been unplugged, therefore don't warn */
>> !(ret == -ENODEV && (led_cdev->flags & LED_UNREGISTERING) &&
>> (led_cdev->flags & LED_HW_PLUGGABLE)))
>
> This function is already pretty messy.
>
> How about something like:
>
> static void set_brightness_delayed_set_brightness(struct led_classdev *led_cdev,
> unsigned int value)
> {
> int ret;
>
> ret = __led_set_brightness(led_cdev, value);
> if (ret == -ENOTSUPP) {
> ret = __led_set_brightness_blocking(led_cdev, value);
> if (ret == -ENOTSUPP)
> /* No back-end support to set a fixed brightness value */
> return;
> }
>
> if (ret == -ENODEV && (led_cdev->flags & LED_UNREGISTERING))
> /* LED HW might have been unplugged, therefore don't warn */
> return;
>
> if (ret < 0 && led_cdev->flags & LED_HW_PLUGGABLE)
> dev_err(led_cdev->dev, "Setting an LED's brightness failed (%d)\n", ret);
> }
>
I think this would be a functional change. If:
ret = -ENODEV
led_cdev->flags & LED_UNREGISTERING is true
led_cdev->flags & LED_HW_PLUGGABLE is false
Current code would warn, proposed new code not.
But I like the idea. Proposal:
static void set_brightness_delayed_set_brightness(struct led_classdev *led_cdev,
unsigned int value)
{
int ret;
ret = __led_set_brightness(led_cdev, value);
if (ret == -ENOTSUPP) {
ret = __led_set_brightness_blocking(led_cdev, value);
if (ret == -ENOTSUPP)
/* No back-end support to set a fixed brightness value */
return;
}
/* LED HW might have been unplugged, therefore don't warn */
if (ret == -ENODEV && led_cdev->flags & LED_UNREGISTERING &&
led_cdev->flags & LED_HW_PLUGGABLE)
return;
if (ret < 0)
dev_err(led_cdev->dev,
"Setting an LED's brightness failed (%d)\n", ret);
}
Fine with me if you submit the patch.
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] leds: core: Omit set_brightness error message for a LED supporting hw trigger only
2024-04-11 20:46 ` Heiner Kallweit
@ 2024-05-02 16:11 ` Lee Jones
0 siblings, 0 replies; 5+ messages in thread
From: Lee Jones @ 2024-05-02 16:11 UTC (permalink / raw)
To: Heiner Kallweit; +Cc: Pavel Machek, linux-leds@vger.kernel.org
On Thu, 11 Apr 2024, Heiner Kallweit wrote:
> On 11.04.2024 16:26, Lee Jones wrote:
> > On Fri, 05 Apr 2024, Heiner Kallweit wrote:
> >
> >> If both set_brightness functions return -ENOTSUPP, then the LED doesn't
> >> support setting a fixed brightness value, and the error message isn't
> >> helpful. This can be the case e.g. for LEDs supporting a specific hw
> >> trigger only.
> >>
> >> Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
> >> ---
> >> drivers/leds/led-core.c | 3 ++-
> >> 1 file changed, 2 insertions(+), 1 deletion(-)
> >>
> >> diff --git a/drivers/leds/led-core.c b/drivers/leds/led-core.c
> >> index 89c9806cc..9485f799f 100644
> >> --- a/drivers/leds/led-core.c
> >> +++ b/drivers/leds/led-core.c
> >> @@ -127,7 +127,8 @@ static void set_brightness_delayed_set_brightness(struct led_classdev *led_cdev,
> >> ret = __led_set_brightness(led_cdev, value);
> >> if (ret == -ENOTSUPP)
> >> ret = __led_set_brightness_blocking(led_cdev, value);
> >> - if (ret < 0 &&
> >> + /* Don't emit error message if LED supports a hw trigger like netdev only */
> >> + if (ret < 0 && ret != -ENOTSUPP &&
> >> /* LED HW might have been unplugged, therefore don't warn */
> >> !(ret == -ENODEV && (led_cdev->flags & LED_UNREGISTERING) &&
> >> (led_cdev->flags & LED_HW_PLUGGABLE)))
> >
> > This function is already pretty messy.
> >
> > How about something like:
> >
> > static void set_brightness_delayed_set_brightness(struct led_classdev *led_cdev,
> > unsigned int value)
> > {
> > int ret;
> >
> > ret = __led_set_brightness(led_cdev, value);
> > if (ret == -ENOTSUPP) {
> > ret = __led_set_brightness_blocking(led_cdev, value);
> > if (ret == -ENOTSUPP)
> > /* No back-end support to set a fixed brightness value */
> > return;
> > }
> >
> > if (ret == -ENODEV && (led_cdev->flags & LED_UNREGISTERING))
> > /* LED HW might have been unplugged, therefore don't warn */
> > return;
> >
> > if (ret < 0 && led_cdev->flags & LED_HW_PLUGGABLE)
> > dev_err(led_cdev->dev, "Setting an LED's brightness failed (%d)\n", ret);
> > }
> >
> I think this would be a functional change. If:
> ret = -ENODEV
> led_cdev->flags & LED_UNREGISTERING is true
> led_cdev->flags & LED_HW_PLUGGABLE is false
>
> Current code would warn, proposed new code not.
>
> But I like the idea. Proposal:
>
> static void set_brightness_delayed_set_brightness(struct led_classdev *led_cdev,
> unsigned int value)
> {
> int ret;
>
> ret = __led_set_brightness(led_cdev, value);
> if (ret == -ENOTSUPP) {
> ret = __led_set_brightness_blocking(led_cdev, value);
> if (ret == -ENOTSUPP)
> /* No back-end support to set a fixed brightness value */
> return;
> }
>
> /* LED HW might have been unplugged, therefore don't warn */
> if (ret == -ENODEV && led_cdev->flags & LED_UNREGISTERING &&
> led_cdev->flags & LED_HW_PLUGGABLE)
> return;
>
> if (ret < 0)
> dev_err(led_cdev->dev,
> "Setting an LED's brightness failed (%d)\n", ret);
> }
>
> Fine with me if you submit the patch.
Sorry, it's been a busy few weeks.
Just so you know, this is still on my radar.
I plan on submitting this for the next cycle.
--
Lee Jones [李琼斯]
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2024-05-02 16:11 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-04-05 20:58 [PATCH] leds: core: Omit set_brightness error message for a LED supporting hw trigger only Heiner Kallweit
2024-04-11 14:26 ` Lee Jones
2024-04-11 14:27 ` Lee Jones
2024-04-11 20:46 ` Heiner Kallweit
2024-05-02 16:11 ` Lee Jones
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).