leds: core: Omit set_brightness error message for a LED supporting hw trigger only
PATCH 1/1 leds: core: Omit set_brightness error message for a LED supporting hw trigger only
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.
--- drivers/leds/led-core.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/leds/led-core.c +2 -1
@@ -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 )))
Signature · 1 line
2.44.0
Lee Jones
maintainerQuoted 15 lines · Heiner Kallweit
If both
set_brightnessfunctions 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 <[email protected]>--- drivers/leds/led-core.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)drivers/leds/led-core.c +0
-0
drivers/leds/led-core.c static void set_brightness_delayed_set_brightness(struct led_classdev *led_cdev, · line 134
Quoted 9 lines
drivers/leds/led-core.c +2
-1@@ -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);}
Signature · 1 line
Lee Jones [李琼斯]
Lee Jones
maintainerQuoted 50 lines · Lee Jones
Quoted 15 lines · Heiner Kallweit
If both
set_brightnessfunctions 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 <[email protected]>--- drivers/leds/led-core.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)drivers/leds/led-core.c +0
-0drivers/leds/led-core.c static void set_brightness_delayed_set_brightness(struct led_classdev *led_cdev, · line 134
Quoted 9 lines
drivers/leds/led-core.c +2
-1@@ -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);
Quoted 1 line
}
If it looks reasonable to you, I'd e happy to submit it as a patch.
Signature · 1 line
Lee Jones [李琼斯]
Quoted 50 lines · Lee Jones
Quoted 15 lines · Heiner Kallweit
If both
set_brightnessfunctions 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 <[email protected]>--- drivers/leds/led-core.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)drivers/leds/led-core.c +0
-0drivers/leds/led-core.c static void set_brightness_delayed_set_brightness(struct led_classdev *led_cdev, · line 134
Quoted 9 lines
drivers/leds/led-core.c +2
-1@@ -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);
Quoted 2 lines
}
I think this would be a functional change. If:
ret = -ENODEVled_cdev->flags & LED_UNREGISTERING is trueled_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.
Lee Jones
maintainerQuoted 85 lines · Heiner Kallweit
Quoted 50 lines · Lee Jones
Quoted 15 lines · Heiner Kallweit
If both
set_brightnessfunctions 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 <[email protected]>--- drivers/leds/led-core.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)drivers/leds/led-core.c +0
-0drivers/leds/led-core.c static void set_brightness_delayed_set_brightness(struct led_classdev *led_cdev, · line 134
Quoted 9 lines
drivers/leds/led-core.c +2
-1@@ -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);Quoted 2 lines
}
I think this would be a functional change. If:
ret =-ENODEVled_cdev->flags&LED_UNREGISTERINGis trueled_cdev->flags&LED_HW_PLUGGABLEis falseCurrent 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); }
Quoted 1 line
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.
Signature · 1 line
Lee Jones [李琼斯]