summaryrefslogtreecommitdiff
path: root/drivers/leds/led-class.c
diff options
context:
space:
mode:
authorThomas Weißschuh <linux@weissschuh.net>2024-05-26 20:17:16 +0200
committerLee Jones <lee@kernel.org>2024-06-14 10:09:40 +0100
commit6b0d3355e5a58fd73529fa6f930a877caca3f75d (patch)
treedad3703a6f01d98d56afcd2f86c4f850c9b6c3f5 /drivers/leds/led-class.c
parentbfefbecdeadc608c625e85259ad0a89d34728d61 (diff)
downloadlinux-6b0d3355e5a58fd73529fa6f930a877caca3f75d.tar.gz
linux-6b0d3355e5a58fd73529fa6f930a877caca3f75d.tar.bz2
linux-6b0d3355e5a58fd73529fa6f930a877caca3f75d.zip
leds: class: Add flag to avoid automatic renaming of LED devices
Add a mechanism for drivers to opt-out of the automatic device renaming on conflicts. Those drivers will provide their own conflict resolution. Signed-off-by: Thomas Weißschuh <linux@weissschuh.net> Link: https://lore.kernel.org/r/20240526-cros_ec-kbd-led-framework-v3-2-ee577415a521@weissschuh.net Signed-off-by: Lee Jones <lee@kernel.org>
Diffstat (limited to 'drivers/leds/led-class.c')
-rw-r--r--drivers/leds/led-class.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/leds/led-class.c b/drivers/leds/led-class.c
index c298355d5b7d..2f08c20702f3 100644
--- a/drivers/leds/led-class.c
+++ b/drivers/leds/led-class.c
@@ -503,6 +503,8 @@ int led_classdev_register_ext(struct device *parent,
ret = led_classdev_next_name(proposed_name, final_name, sizeof(final_name));
if (ret < 0)
return ret;
+ else if (ret && led_cdev->flags & LED_REJECT_NAME_CONFLICT)
+ return -EEXIST;
else if (ret)
dev_warn(parent, "Led %s renamed to %s due to name collision\n",
proposed_name, final_name);