Skip to contentSkip to conversation

leds: trigger: panic: simplify led_trigger_set_panic

PATCH Applied Heiner Kallweit 3 participants 5 messages Dec 9, 2023 – Jan 25, 2024 LED

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 leds: trigger: panic: simplify led_trigger_set_panic

I don't see why we iterate over all triggers to find the panic trigger. We *are* the panic trigger. Therefore we also know that the panic trigger doesn't have an activate() hook. So we can simplify the code significantly.

---
 drivers/leds/trigger/ledtrig-panic.c | 23 +++++++----------------
 1 file changed, 7 insertions(+), 16 deletions(-)
drivers/leds/trigger/ledtrig-panic.c +7 -16
index 72297a845..c646a3cbc 100644
@@ -21,24 +21,15 @@ static struct led_trigger *trigger;
  */
 static void led_trigger_set_panic(struct led_classdev *led_cdev)
 {
-	struct led_trigger *trig;
+	if (led_cdev->trigger)
+		list_del(&led_cdev->trig_list);
+	list_add_tail(&led_cdev->trig_list, &trigger->led_cdevs);
 
-	list_for_each_entry(trig, &trigger_list, next_trig) {
-		if (strcmp("panic", trig->name))
-			continue;
-		if (led_cdev->trigger)
-			list_del(&led_cdev->trig_list);
-		list_add_tail(&led_cdev->trig_list, &trig->led_cdevs);
+	/* Avoid the delayed blink path */
+	led_cdev->blink_delay_on = 0;
+	led_cdev->blink_delay_off = 0;
 
-		/* Avoid the delayed blink path */
-		led_cdev->blink_delay_on = 0;
-		led_cdev->blink_delay_off = 0;
-
-		led_cdev->trigger = trig;
-		if (trig->activate)
-			trig->activate(led_cdev);
-		break;
-	}
+	led_cdev->trigger = trigger;
 }
 
 static int led_trigger_panic_notifier(struct notifier_block *nb,
Signature · 1 line
2.43.0
maintainer
#1 lore raw
Quoted 9 lines · Heiner Kallweit

I don't see why we iterate over all triggers to find the panic trigger. We *are* the panic trigger. Therefore we also know that the panic trigger doesn't have an activate() hook. So we can simplify the code significantly.

---
 drivers/leds/trigger/ledtrig-panic.c | 23 +++++++----------------
 1 file changed, 7 insertions(+), 16 deletions(-)

I would like to take a little advice from the author here who should have been Cc:ed. In case there is information we're missing or overseeing.

Quoted 39 lines
drivers/leds/trigger/ledtrig-panic.c +7 -16
index 72297a845..c646a3cbc 100644
@@ -21,24 +21,15 @@ static struct led_trigger *trigger;
  */
 static void led_trigger_set_panic(struct led_classdev *led_cdev)
 {
-	struct led_trigger *trig;
+	if (led_cdev->trigger)
+		list_del(&led_cdev->trig_list);
+	list_add_tail(&led_cdev->trig_list, &trigger->led_cdevs);
 
-	list_for_each_entry(trig, &trigger_list, next_trig) {
-		if (strcmp("panic", trig->name))
-			continue;
-		if (led_cdev->trigger)
-			list_del(&led_cdev->trig_list);
-		list_add_tail(&led_cdev->trig_list, &trig->led_cdevs);
+	/* Avoid the delayed blink path */
+	led_cdev->blink_delay_on = 0;
+	led_cdev->blink_delay_off = 0;
 
-		/* Avoid the delayed blink path */
-		led_cdev->blink_delay_on = 0;
-		led_cdev->blink_delay_off = 0;
-
-		led_cdev->trigger = trig;
-		if (trig->activate)
-			trig->activate(led_cdev);
-		break;
-	}
+	led_cdev->trigger = trigger;
 }
 
 static int led_trigger_panic_notifier(struct notifier_block *nb,
Signature · 1 line
2.43.0
Signature · 1 line
Lee Jones [李琼斯]
Reviewed-by on v1 1/1
#2 lore raw
In reply to Heiner Kallweit
Quoted 36 lines · Heiner Kallweit

I don't see why we iterate over all triggers to find the panic trigger. We *are* the panic trigger. Therefore we also know that the panic trigger doesn't have an activate() hook. So we can simplify the code significantly.

---
  drivers/leds/trigger/ledtrig-panic.c | 23 +++++++----------------
  1 file changed, 7 insertions(+), 16 deletions(-)
drivers/leds/trigger/ledtrig-panic.c +6 -10
index 72297a845..c646a3cbc 100644
@@ -21,24 +21,15 @@ static struct led_trigger *trigger;
   */
  static void led_trigger_set_panic(struct led_classdev *led_cdev)
  {
-	struct led_trigger *trig;
+	if (led_cdev->trigger)
+		list_del(&led_cdev->trig_list);
+	list_add_tail(&led_cdev->trig_list, &trigger->led_cdevs);
 
-	list_for_each_entry(trig, &trigger_list, next_trig) {
-		if (strcmp("panic", trig->name))
-			continue;
-		if (led_cdev->trigger)
-			list_del(&led_cdev->trig_list);
-		list_add_tail(&led_cdev->trig_list, &trig->led_cdevs);
+	/* Avoid the delayed blink path */
+	led_cdev->blink_delay_on = 0;
+	led_cdev->blink_delay_off = 0;
 
-		/* Avoid the delayed blink path */
-		led_cdev->blink_delay_on = 0;
-		led_cdev->blink_delay_off = 0;

drivers/leds/trigger/ledtrig-panic.c static struct led_trigger *trigger; · line 35

Quoted 10 lines
drivers/leds/trigger/ledtrig-panic.c +1 -6
-
-		led_cdev->trigger = trig;
-		if (trig->activate)
-			trig->activate(led_cdev);
-		break;
-	}
+	led_cdev->trigger = trigger;
  }
 
  static int led_trigger_panic_notifier(struct notifier_block *nb,

Looks good to me.

Signature · 2 lines
Best regards,
Jacek Anaszewski
maintainer
#3 lore raw
Quoted 47 lines · Jacek Anaszewski
Quoted 33 lines · Heiner Kallweit

I don't see why we iterate over all triggers to find the panic trigger. We *are* the panic trigger. Therefore we also know that the panic trigger doesn't have an activate() hook. So we can simplify the code significantly.

---
  drivers/leds/trigger/ledtrig-panic.c | 23 +++++++----------------
  1 file changed, 7 insertions(+), 16 deletions(-)
drivers/leds/trigger/ledtrig-panic.c +6 -9
index 72297a845..c646a3cbc 100644
@@ -21,24 +21,15 @@ static struct led_trigger *trigger;
   */
  static void led_trigger_set_panic(struct led_classdev *led_cdev)
  {
-	struct led_trigger *trig;
+	if (led_cdev->trigger)
+		list_del(&led_cdev->trig_list);
+	list_add_tail(&led_cdev->trig_list, &trigger->led_cdevs);
-	list_for_each_entry(trig, &trigger_list, next_trig) {
-		if (strcmp("panic", trig->name))
-			continue;
-		if (led_cdev->trigger)
-			list_del(&led_cdev->trig_list);
-		list_add_tail(&led_cdev->trig_list, &trig->led_cdevs);
+	/* Avoid the delayed blink path */
+	led_cdev->blink_delay_on = 0;
+	led_cdev->blink_delay_off = 0;
-		/* Avoid the delayed blink path */
-		led_cdev->blink_delay_on = 0;

drivers/leds/trigger/ledtrig-panic.c static struct led_trigger *trigger; · line 32

Quoted 10 lines
drivers/leds/trigger/ledtrig-panic.c +1 -7
-		led_cdev->blink_delay_off = 0;
-
-		led_cdev->trigger = trig;
-		if (trig->activate)
-			trig->activate(led_cdev);
-		break;
-	}
+	led_cdev->trigger = trigger;
  }
  static int led_trigger_panic_notifier(struct notifier_block *nb,

Looks good to me.

Quoted 1 line

Thanks Jacek. Always helpful.

Signature · 1 line
Lee Jones [李琼斯]
maintainer Applied
#4 lore raw

Re: (subset) [PATCH] leds: trigger: panic: simplify led_trigger_set_panic

In reply to Heiner Kallweit
Quoted 6 lines · Heiner Kallweit

I don't see why we iterate over all triggers to find the panic trigger. We *are* the panic trigger. Therefore we also know that the panic trigger doesn't have an activate() hook. So we can simplify the code significantly.

Applied, thanks!

[1/1] leds: trigger: panic: simplify led_trigger_set_panic

      commit: 682e98564ffb67989a77002844767318d366a9ee

--
Lee Jones [李琼斯]