leds: set max_brightness to 1 for on/off-only drivers
PATCH 1/1 leds: set max_brightness to 1 for on/off-only drivers
The following drivers implement their brightness_set() callback as a pure on/off switch: any nonzero brightness value turns the LED on, and there is no way to request intermediate levels. They still keep the default max_brightness of LED_FULL (255), so user space writing e.g. "100" or "200" to the brightness sysfs attribute produces exactly the same hardware state, which is misleading and violates the first item of the drivers/leds/TODO list ("On/off LEDs should have max_brightness of 1").
Address this by setting max_brightness to 1 for all on/off-only LED drivers in drivers/leds, and by using LED_ON instead of LED_FULL for their initial brightness values and brightness_get() results:
ariel, bcm6328, bcm6358, cobalt-qube, cobalt-raq, hp6xx, ipaq-micro, locomo, menf21bmc, net48xx, ot200, rb532, ss4200, syscon, wrap
---
drivers/leds/leds-ariel.c | 1 +
drivers/leds/leds-bcm6328.c | 3 ++-
drivers/leds/leds-bcm6358.c | 3 ++-
drivers/leds/leds-cobalt-qube.c | 3 ++-
drivers/leds/leds-cobalt-raq.c | 2 ++
drivers/leds/leds-hp6xx.c | 2 ++
drivers/leds/leds-ipaq-micro.c | 1 +
drivers/leds/leds-locomo.c | 2 ++
drivers/leds/leds-menf21bmc.c | 1 +
drivers/leds/leds-net48xx.c | 1 +
drivers/leds/leds-ot200.c | 1 +
drivers/leds/leds-rb532.c | 3 ++-
drivers/leds/leds-ss4200.c | 6 ++++--
drivers/leds/leds-syscon.c | 1 +
drivers/leds/leds-wrap.c | 3 +++
15 files changed, 27 insertions(+), 6 deletions(-)
drivers/leds/leds-ariel.c +0 -0
@@ -111,6 +111,7 @@ static int ariel_led_probe(struct platform_device *pdev)
leds[i].led_cdev.brightness_get = ariel_led_get; leds[i].led_cdev.brightness_set = ariel_led_set; leds[i].led_cdev.blink_set = ariel_blink_set; + leds[i].led_cdev.max_brightness = 1;
ret = devm_led_classdev_register(dev, &leds[i].led_cdev); if (ret)
drivers/leds/leds-bcm6328.c +0 -0
@@ -366,7 +366,7 @@ static int bcm6328_led(struct device *dev, struct device_node *nc, u32 reg,
val &= BCM6328_LED_MODE_MASK;
if ((led->active_low && val == BCM6328_LED_MODE_OFF) || (!led->active_low && val == BCM6328_LED_MODE_ON))
- led->cdev.brightness = LED_FULL;
+ led->cdev.brightness = LED_ON;
else
led->cdev.brightness = LED_OFF;
break;
@@ -378,6 +378,7 @@ static int bcm6328_led(struct device *dev, struct device_node *nc, u32 reg,
led->cdev.brightness_set = bcm6328_led_set;
led->cdev.blink_set = bcm6328_blink_set;
+ led->cdev.max_brightness = 1;
rc = devm_led_classdev_register_ext(dev, &led->cdev, &init_data); if (rc < 0)
drivers/leds/leds-bcm6358.c +0 -0
@@ -122,7 +122,7 @@ static int bcm6358_led(struct device *dev, struct device_node *nc, u32 reg,
val = bcm6358_led_read(led->mem + BCM6358_REG_MODE);
val &= BIT(led->pin);
if ((led->active_low && !val) || (!led->active_low && val))
- led->cdev.brightness = LED_FULL;
+ led->cdev.brightness = LED_ON;
else
led->cdev.brightness = LED_OFF;
break;
@@ -133,6 +133,7 @@ static int bcm6358_led(struct device *dev, struct device_node *nc, u32 reg, bcm6358_led_set(&led->cdev, led->cdev.brightness);
led->cdev.brightness_set = bcm6358_led_set;
+ led->cdev.max_brightness = 1;
rc = devm_led_classdev_register_ext(dev, &led->cdev, &init_data); if (rc < 0)
drivers/leds/leds-cobalt-qube.c +0 -0
@@ -29,7 +29,8 @@ static void qube_front_led_set(struct led_classdev *led_cdev,
static struct led_classdev qube_front_led = {
.name = "qube::front",
- .brightness = LED_FULL,
+ .brightness = LED_ON,
+ .max_brightness = 1,
.brightness_set = qube_front_led_set,
.default_trigger = "default-on",
};
drivers/leds/leds-cobalt-raq.c +0 -0
@@ -39,6 +39,7 @@ static void raq_web_led_set(struct led_classdev *led_cdev,
static struct led_classdev raq_web_led = {
.name = "raq::web",
.brightness_set = raq_web_led_set,
+ .max_brightness = 1,
};
static void raq_power_off_led_set(struct led_classdev *led_cdev,
@@ -60,6 +61,7 @@ static void raq_power_off_led_set(struct led_classdev *led_cdev, static struct led_classdev raq_power_off_led = {
.name = "raq::power-off",
.brightness_set = raq_power_off_led_set,
+ .max_brightness = 1,
.default_trigger = "power-off",
};
drivers/leds/leds-hp6xx.c +0 -0
@@ -42,6 +42,7 @@ static struct led_classdev hp6xx_red_led = {
.name = "hp6xx:red",
.default_trigger = "hp6xx-charge",
.brightness_set = hp6xxled_red_set,
+ .max_brightness = 1,
.flags = LED_CORE_SUSPENDRESUME,
};
@@ -49,6 +50,7 @@ static struct led_classdev hp6xx_green_led = { .name = "hp6xx:green", .default_trigger = "disk-activity", .brightness_set = hp6xxled_green_set,
+ .max_brightness = 1,
.flags = LED_CORE_SUSPENDRESUME,
};
drivers/leds/leds-ipaq-micro.c +0 -0
@@ -102,6 +102,7 @@ static struct led_classdev micro_led = {
.name = "led-ipaq-micro", .brightness_set_blocking = micro_leds_brightness_set, .blink_set = micro_leds_blink_set,
+ .max_brightness = 1,
.flags = LED_CORE_SUSPENDRESUME, };
drivers/leds/leds-locomo.c +0 -0
@@ -43,12 +43,14 @@ static struct led_classdev locomo_led0 = {
.name = "locomo:amber:charge", .default_trigger = "main-battery-charging", .brightness_set = locomoled_brightness_set0, + .max_brightness = 1,
};
static struct led_classdev locomo_led1 = { .name = "locomo:green:mail", .default_trigger = "nand-disk", .brightness_set = locomoled_brightness_set1, + .max_brightness = 1,
};
static int locomoled_probe(struct locomo_dev *ldev)
drivers/leds/leds-menf21bmc.c +0 -0
@@ -82,6 +82,7 @@ static int menf21bmc_led_probe(struct platform_device *pdev)
for (i = 0; i < ARRAY_SIZE(leds); i++) { leds[i].cdev.name = leds[i].name; leds[i].cdev.brightness_set = menf21bmc_led_set; + leds[i].cdev.max_brightness = 1; leds[i].i2c_client = i2c_client;
ret = devm_led_classdev_register(&pdev->dev, &leds[i].cdev); if (ret < 0) {
drivers/leds/leds-net48xx.c +0 -0
@@ -31,6 +31,7 @@ static void net48xx_error_led_set(struct led_classdev *led_cdev,
static struct led_classdev net48xx_error_led = {
.name = "net48xx::error",
.brightness_set = net48xx_error_led_set,
+ .max_brightness = 1,
.flags = LED_CORE_SUSPENDRESUME,
};
drivers/leds/leds-ot200.c +0 -0
@@ -123,6 +123,7 @@ static int ot200_led_probe(struct platform_device *pdev)
leds[i].cdev.name = leds[i].name; leds[i].cdev.brightness_set = ot200_led_brightness_set; + leds[i].cdev.max_brightness = 1;
ret = devm_led_classdev_register(&pdev->dev, &leds[i].cdev); if (ret < 0)
drivers/leds/leds-rb532.c +0 -0
@@ -27,12 +27,13 @@ static void rb532_led_set(struct led_classdev *cdev,
static enum led_brightness rb532_led_get(struct led_classdev *cdev) {
- return (get_latch_u5() & LO_ULED) ? LED_FULL : LED_OFF; + return (get_latch_u5() & LO_ULED) ? LED_ON : LED_OFF; }
static struct led_classdev rb532_uled = {
.name = "uled",
.brightness_set = rb532_led_set,
+ .max_brightness = 1,
.brightness_get = rb532_led_get,
.default_trigger = "nand-disk",
};
drivers/leds/leds-ss4200.c +0 -0
@@ -214,7 +214,8 @@ static u32 nasgpio_led_get_attr(struct led_classdev *led_cdev, u32 port)
/*
* There is actual brightness control in the hardware,
* but it is via smbus commands and not implemented
- * in this driver.
+ * in this driver, so the LED is treated as on/off and
+ * max_brightness is set to 1.
*/
static void nasgpio_led_set_brightness(struct led_classdev *led_cdev, enum led_brightness brightness)
@@ -487,9 +488,10 @@ static int register_nasgpio_led(int led_nr) led->name = nas_led->name;
led->brightness = LED_OFF;
if (nasgpio_led_get_attr(led, GP_LVL))
- led->brightness = LED_FULL;
+ led->brightness = LED_ON;
led->brightness_set = nasgpio_led_set_brightness; led->blink_set = nasgpio_led_set_blink;
+ led->max_brightness = 1;
led->groups = nasgpio_led_groups;
return led_classdev_register(&nas_gpio_pci_dev->dev, led);
drivers/leds/leds-syscon.c +0 -0
@@ -110,6 +110,7 @@ static int syscon_led_probe(struct platform_device *pdev)
sled->state = false;
}
sled->cdev.brightness_set = syscon_led_set;
+ sled->cdev.max_brightness = 1;
ret = devm_led_classdev_register_ext(dev, &sled->cdev, &init_data); if (ret < 0)
drivers/leds/leds-wrap.c +0 -0
@@ -53,6 +53,7 @@ static void wrap_extra_led_set(struct led_classdev *led_cdev,
static struct led_classdev wrap_power_led = {
.name = "wrap::power",
.brightness_set = wrap_power_led_set,
+ .max_brightness = 1,
.default_trigger = "default-on",
.flags = LED_CORE_SUSPENDRESUME,
};
@@ -60,12 +61,14 @@ static struct led_classdev wrap_power_led = { static struct led_classdev wrap_error_led = {
.name = "wrap::error",
.brightness_set = wrap_error_led_set,
+ .max_brightness = 1,
.flags = LED_CORE_SUSPENDRESUME,
};
static struct led_classdev wrap_extra_led = {
.name = "wrap::extra",
.brightness_set = wrap_extra_led_set,
+ .max_brightness = 1,
.flags = LED_CORE_SUSPENDRESUME,
};
Lee Jones
maintainerQuoted 9 lines · MYYDAQ
The following drivers implement their
brightness_set()callback as a pure on/off switch: any nonzero brightness value turns the LED on, and there is no way to request intermediate levels. They still keep the defaultmax_brightnessofLED_FULL(255), so user space writing e.g. "100" or "200" to the brightness sysfs attribute produces exactly the same hardware state, which is misleading and violates the first item of thedrivers/leds/TODOlist ("On/off LEDs should havemax_brightnessof 1").
Quoted 7 lines
Address this by setting
max_brightnessto 1 for all on/off-only LED drivers indrivers/leds, and by usingLED_ONinstead ofLED_FULLfor their initial brightness values andbrightness_get()results:ariel, bcm6328, bcm6358, cobalt-qube, cobalt-raq, hp6xx, ipaq-micro, locomo, menf21bmc, net48xx, ot200, rb532, ss4200, syscon, wrap
I'm guessing this patch was created with AI, right?
Quoted 1 line
Signed-off-by MYYDAQ <[email protected]>
Could you please sign off using your full, real name? The 'Signed-off-by' tag requires a real name rather than a pseudonym or username.
Quoted 23 lines
---
drivers/leds/leds-ariel.c | 1 +
drivers/leds/leds-bcm6328.c | 3 ++-
drivers/leds/leds-bcm6358.c | 3 ++-
drivers/leds/leds-cobalt-qube.c | 3 ++-
drivers/leds/leds-cobalt-raq.c | 2 ++
drivers/leds/leds-hp6xx.c | 2 ++
drivers/leds/leds-ipaq-micro.c | 1 +
drivers/leds/leds-locomo.c | 2 ++
drivers/leds/leds-menf21bmc.c | 1 +
drivers/leds/leds-net48xx.c | 1 +
drivers/leds/leds-ot200.c | 1 +
drivers/leds/leds-rb532.c | 3 ++-
drivers/leds/leds-ss4200.c | 6 ++++--
drivers/leds/leds-syscon.c | 1 +
drivers/leds/leds-wrap.c | 3 +++15 files changed, 27 insertions(+), 6 deletions(-)drivers/leds/leds-ariel.c +0
-0
drivers/leds/leds-ariel.c static int ariel_led_probe(struct platform_device *pdev) · line 114
Quoted 4 lines
drivers/leds/leds-ariel.c +1
-0@@ -111,6 +111,7 @@ static int ariel_led_probe(struct platform_device *pdev) leds[i].led_cdev.brightness_get = ariel_led_get; leds[i].led_cdev.brightness_set = ariel_led_set; leds[i].led_cdev.blink_set = ariel_blink_set; + leds[i].led_cdev.max_brightness = 1;
Use tabs, not spaces.
Did you run checkpatch.pl?
Quoted 54 lines
drivers/leds/leds-ariel.c +0
-0ret = devm_led_classdev_register(dev, &leds[i].led_cdev); if (ret)drivers/leds/leds-bcm6328.c +0
-0@@ -366,7 +366,7 @@ static int bcm6328_led(struct device *dev, struct device_node *nc, u32 reg, val &= BCM6328_LED_MODE_MASK;if ((
led->active_low&& val ==BCM6328_LED_MODE_OFF) || (!led->active_low && val ==BCM6328_LED_MODE_ON)) -led->cdev.brightness=LED_FULL;
+led->cdev.brightness=LED_ON;
else
led->cdev.brightness =LED_OFF;
break;drivers/leds/leds-bcm6328.c +1
-0@@ -378,6 +378,7 @@ static int bcm6328_led(struct device *dev, struct device_node *nc, u32 reg, led->cdev.brightness_set = bcm6328_led_set; led->cdev.blink_set = bcm6328_blink_set; + led->cdev.max_brightness = 1; rc = devm_led_classdev_register_ext(dev, &led->cdev, &init_data);if (rc < 0)
drivers/leds/leds-bcm6358.c +1
-1@@ -122,7 +122,7 @@ static int bcm6358_led(struct device *dev, struct device_node *nc, u32 reg, val = bcm6358_led_read(led->mem + BCM6358_REG_MODE); val &= BIT(led->pin); if ((led->active_low && !val) || (!led->active_low && val)) - led->cdev.brightness = LED_FULL; + led->cdev.brightness = LED_ON;else
led->cdev.brightness =LED_OFF;
break;drivers/leds/leds-bcm6358.c +1
-0@@ -133,6 +133,7 @@ static int bcm6358_led(struct device *dev, struct device_node *nc, u32 reg, bcm6358_led_set(&led->cdev, led->cdev.brightness); led->cdev.brightness_set = bcm6358_led_set; + led->cdev.max_brightness = 1; rc = devm_led_classdev_register_ext(dev, &led->cdev, &init_data);if (rc < 0)
drivers/leds/leds-cobalt-qube.c +0
-0
drivers/leds/leds-cobalt-qube.c static void qube_front_led_set(struct led_classdev · line 34
Quoted 7 lines
drivers/leds/leds-cobalt-qube.c +2
-1@@ -29,7 +29,8 @@ static void qube_front_led_set(struct led_classdev *led_cdev, static struct led_classdev qube_front_led = { .name = "qube::front", - .brightness = LED_FULL, + .brightness = LED_ON, + .max_brightness = 1,
Some odd alignment issues going on here.
Quoted 200 lines
drivers/leds/leds-cobalt-qube.c +0
-0.brightness_set = qube_front_led_set, .default_trigger = "default-on",};
drivers/leds/leds-cobalt-raq.c +2
-0@@ -39,6 +39,7 @@ static void raq_web_led_set(struct led_classdev *led_cdev, static struct led_classdev raq_web_led = { .name = "raq::web", .brightness_set = raq_web_led_set, + .max_brightness = 1, }; static void raq_power_off_led_set(struct led_classdev *led_cdev,@@ -60,6 +61,7 @@ static void raq_power_off_led_set(struct led_classdev *led_cdev, static struct led_classdev raq_power_off_led = { .name = "raq::power-off", .brightness_set = raq_power_off_led_set, + .max_brightness = 1, .default_trigger = "power-off", };drivers/leds/leds-hp6xx.c +2
-0@@ -42,6 +42,7 @@ static struct led_classdev hp6xx_red_led = { .name = "hp6xx:red", .default_trigger = "hp6xx-charge", .brightness_set = hp6xxled_red_set, + .max_brightness = 1, .flags = LED_CORE_SUSPENDRESUME, };@@ -49,6 +50,7 @@ static struct led_classdev hp6xx_green_led = { .name = "hp6xx:green", .default_trigger = "disk-activity", .brightness_set = hp6xxled_green_set, + .max_brightness = 1, .flags = LED_CORE_SUSPENDRESUME, };drivers/leds/leds-ipaq-micro.c +1
-0@@ -102,6 +102,7 @@ static struct led_classdev micro_led = { .name = "led-ipaq-micro", .brightness_set_blocking = micro_leds_brightness_set, .blink_set = micro_leds_blink_set, + .max_brightness = 1, .flags = LED_CORE_SUSPENDRESUME, };drivers/leds/leds-locomo.c +2
-0@@ -43,12 +43,14 @@ static struct led_classdev locomo_led0 = { .name = "locomo:amber:charge", .default_trigger = "main-battery-charging", .brightness_set = locomoled_brightness_set0, + .max_brightness = 1, }; static struct led_classdev locomo_led1 = { .name = "locomo:green:mail", .default_trigger = "nand-disk", .brightness_set = locomoled_brightness_set1, + .max_brightness = 1, }; static int locomoled_probe(struct locomo_dev *ldev)drivers/leds/leds-menf21bmc.c +1
-0@@ -82,6 +82,7 @@ static int menf21bmc_led_probe(struct platform_device *pdev) for (i = 0; i < ARRAY_SIZE(leds); i++) { leds[i].cdev.name = leds[i].name; leds[i].cdev.brightness_set = menf21bmc_led_set; + leds[i].cdev.max_brightness = 1; leds[i].i2c_client = i2c_client; ret = devm_led_classdev_register(&pdev->dev, &leds[i].cdev);if (ret < 0) {
drivers/leds/leds-net48xx.c +1
-0@@ -31,6 +31,7 @@ static void net48xx_error_led_set(struct led_classdev *led_cdev, static struct led_classdev net48xx_error_led = { .name = "net48xx::error", .brightness_set = net48xx_error_led_set, + .max_brightness = 1, .flags = LED_CORE_SUSPENDRESUME, };drivers/leds/leds-ot200.c +1
-0@@ -123,6 +123,7 @@ static int ot200_led_probe(struct platform_device *pdev) leds[i].cdev.name = leds[i].name; leds[i].cdev.brightness_set = ot200_led_brightness_set; + leds[i].cdev.max_brightness = 1; ret = devm_led_classdev_register(&pdev->dev, &leds[i].cdev); if (ret < 0)drivers/leds/leds-rb532.c +2
-1@@ -27,12 +27,13 @@ static void rb532_led_set(struct led_classdev *cdev, static enum led_brightness rb532_led_get(struct led_classdev *cdev) { - return (get_latch_u5() & LO_ULED) ? LED_FULL : LED_OFF; + return (get_latch_u5() & LO_ULED) ? LED_ON : LED_OFF; } static struct led_classdev rb532_uled = { .name = "uled", .brightness_set = rb532_led_set, + .max_brightness = 1, .brightness_get = rb532_led_get, .default_trigger = "nand-disk", };drivers/leds/leds-ss4200.c +2
-1@@ -214,7 +214,8 @@ static u32 nasgpio_led_get_attr(struct led_classdev *led_cdev, u32 port) /* * There is actual brightness control in the hardware, * but it is via smbus commands and not implemented - * in this driver. + * in this driver, so the LED is treated as on/off and + * max_brightness is set to 1. */ static void nasgpio_led_set_brightness(struct led_classdev *led_cdev,enum
led_brightnessbrightness)drivers/leds/leds-ss4200.c +2
-1@@ -487,9 +488,10 @@ static int register_nasgpio_led(int led_nr) led->name = nas_led->name; led->brightness = LED_OFF; if (nasgpio_led_get_attr(led, GP_LVL)) - led->brightness = LED_FULL; + led->brightness = LED_ON; led->brightness_set = nasgpio_led_set_brightness; led->blink_set = nasgpio_led_set_blink; + led->max_brightness = 1; led->groups = nasgpio_led_groups; return led_classdev_register(&nas_gpio_pci_dev->dev, led);drivers/leds/leds-syscon.c +1
-0@@ -110,6 +110,7 @@ static int syscon_led_probe(struct platform_device *pdev) sled->state = false; } sled->cdev.brightness_set = syscon_led_set; + sled->cdev.max_brightness = 1; ret = devm_led_classdev_register_ext(dev, &sled->cdev, &init_data);if (ret < 0)
drivers/leds/leds-wrap.c +1
-0@@ -53,6 +53,7 @@ static void wrap_extra_led_set(struct led_classdev *led_cdev, static struct led_classdev wrap_power_led = { .name = "wrap::power", .brightness_set = wrap_power_led_set, + .max_brightness = 1, .default_trigger = "default-on", .flags = LED_CORE_SUSPENDRESUME,};
drivers/leds/leds-wrap.c +2
-0@@ -60,12 +61,14 @@ static struct led_classdev wrap_power_led = { static struct led_classdev wrap_error_led = { .name = "wrap::error", .brightness_set = wrap_error_led_set, + .max_brightness = 1, .flags = LED_CORE_SUSPENDRESUME, }; static struct led_classdev wrap_extra_led = { .name = "wrap::extra", .brightness_set = wrap_extra_led_set, + .max_brightness = 1, .flags = LED_CORE_SUSPENDRESUME, };
Signature · 1 line
Lee Jones