Skip to contentSkip to conversation

leds: core: Omit set_brightness error message for a LED supporting hw trigger only

PATCH In review Heiner Kallweit 2 participants 5 messages Apr 5, 2024 – May 2, 2024 LED

lore
Share & tools
lore
#0 lore raw

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
index 89c9806cc..9485f799f 100644
@@ -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
maintainer
#1 lore raw
Quoted 15 lines · Heiner Kallweit

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 +0 -0
index 89c9806cc..9485f799f 100644

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 [李琼斯]
maintainer
#2 lore raw
Quoted 50 lines · Lee Jones
Quoted 15 lines · Heiner Kallweit

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 +0 -0
index 89c9806cc..9485f799f 100644

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);
Quoted 1 line

}

If it looks reasonable to you, I'd e happy to submit it as a patch.

Signature · 1 line
Lee Jones [李琼斯]
#3 lore raw
In reply to Lee Jones
Quoted 50 lines · Lee Jones
Quoted 15 lines · Heiner Kallweit

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 +0 -0
index 89c9806cc..9485f799f 100644

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);
Quoted 2 lines

}

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.

maintainer
#4 lore raw
Quoted 85 lines · Heiner Kallweit
Quoted 50 lines · Lee Jones
Quoted 15 lines · Heiner Kallweit

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 +0 -0
index 89c9806cc..9485f799f 100644

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);
Quoted 2 lines

}

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);
}
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 [李琼斯]