leds: triggers: Add helper led_match_default_trigger
PATCH 1/1 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 <[email protected]>
---
applies on top of for-leds-next
--- drivers/leds/led-triggers.c | 29 +++++++++++++++++------------ 1 file changed, 17 insertions(+), 12 deletions(-)
drivers/leds/led-triggers.c +17 -12
@@ -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);
Signature · 1 line
2.43.0
Re: (subset) [PATCH] leds: triggers: Add helper led_match_default_trigger
Quoted 4 lines · Heiner Kallweit
Avoid code duplication and factor out common functionality to new helper
led_match_default_trigger().
Applied, thanks!
[1/1] leds: triggers: Add helper led_match_default_trigger
commit: 2953ce75e09a64a0e693367a686f5c68ac3a44f2
--
Lee Jones [李琼斯]