diff options
| author | Heiner Kallweit <hkallweit1@gmail.com> | 2024-01-31 15:33:08 +0100 |
|---|---|---|
| committer | Lee Jones <lee@kernel.org> | 2024-03-07 09:48:05 +0100 |
| commit | 9225333e480831cec3884977eaff05fcf0ea9700 (patch) | |
| tree | e7f48b53a7ab24833a6d13d34c656f3beb4217f0 /drivers/leds/led-triggers.c | |
| parent | leds: trigger: Stop exporting trigger_list (diff) | |
| download | linux-9225333e480831cec3884977eaff05fcf0ea9700.tar.xz linux-9225333e480831cec3884977eaff05fcf0ea9700.zip | |
leds: triggers: Add helper led_match_default_trigger
Avoid code duplication and factor out common functionality to new
helper led_match_default_trigger().
Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Link: https://lore.kernel.org/r/d78eef6f-c18c-4546-b83e-6d1890849154@gmail.com
Signed-off-by: Lee Jones <lee@kernel.org>
Diffstat (limited to 'drivers/leds/led-triggers.c')
| -rw-r--r-- | drivers/leds/led-triggers.c | 29 |
1 files changed, 17 insertions, 12 deletions
diff --git a/drivers/leds/led-triggers.c b/drivers/leds/led-triggers.c index 371000770d75..0f5ac30053ad 100644 --- a/drivers/leds/led-triggers.c +++ b/drivers/leds/led-triggers.c @@ -247,6 +247,19 @@ void led_trigger_remove(struct led_classdev *led_cdev) } EXPORT_SYMBOL_GPL(led_trigger_remove); +static bool led_match_default_trigger(struct led_classdev *led_cdev, + struct led_trigger *trig) +{ + if (!strcmp(led_cdev->default_trigger, trig->name) && + trigger_relevant(led_cdev, trig)) { + led_cdev->flags |= LED_INIT_DEFAULT_TRIGGER; + led_trigger_set(led_cdev, trig); + return true; + } + + return false; +} + void led_trigger_set_default(struct led_classdev *led_cdev) { struct led_trigger *trig; @@ -258,13 +271,9 @@ void led_trigger_set_default(struct led_classdev *led_cdev) down_read(&triggers_list_lock); down_write(&led_cdev->trigger_lock); list_for_each_entry(trig, &trigger_list, next_trig) { - if (!strcmp(led_cdev->default_trigger, trig->name) && - trigger_relevant(led_cdev, trig)) { - found = true; - led_cdev->flags |= LED_INIT_DEFAULT_TRIGGER; - led_trigger_set(led_cdev, trig); + found = led_match_default_trigger(led_cdev, trig); + if (found) break; - } } up_write(&led_cdev->trigger_lock); up_read(&triggers_list_lock); @@ -306,12 +315,8 @@ int led_trigger_register(struct led_trigger *trig) down_read(&leds_list_lock); list_for_each_entry(led_cdev, &leds_list, node) { down_write(&led_cdev->trigger_lock); - if (!led_cdev->trigger && led_cdev->default_trigger && - !strcmp(led_cdev->default_trigger, trig->name) && - trigger_relevant(led_cdev, trig)) { - led_cdev->flags |= LED_INIT_DEFAULT_TRIGGER; - led_trigger_set(led_cdev, trig); - } + if (!led_cdev->trigger && led_cdev->default_trigger) + led_match_default_trigger(led_cdev, trig); up_write(&led_cdev->trigger_lock); } up_read(&leds_list_lock); |