power: supply: leds: Share trig pointer for online and charging_full

Either 5 different LED triggers are registered for battery power-supply
devices or a single online LED trigger is used for non battery power-supply
devices.

These 5 / 1 LED trigger(s) are never used at the same time. So there is
no need for a separate LED trigger pointer for the online trigger. Rename
the first battery trigger from charging_full_trig to just trig and use this
for the online trigger too.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Andy Shevchenko <andy@kernel.org>
Link: https://lore.kernel.org/r/20240531134702.166145-3-hdegoede@redhat.com
Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>

diff --git a/drivers/power/supply/power_supply_leds.c b/drivers/power/supply/power_supply_leds.c
index e3f65ff2f0645819f0661b9b8b0d0a07abd49967..f2d6b8d337071a6a54ed82cacdcedc35c02b444a 100644 (file)
--- a/drivers/power/supply/power_supply_leds.c
+++ b/drivers/power/supply/power_supply_leds.c
@@ -91,7 +91,7 @@ static void power_supply_update_bat_leds(struct power_supply *psy)
 
        switch (status.intval) {
        case POWER_SUPPLY_STATUS_FULL:
-               led_trigger_event(psy->charging_full_trig, LED_FULL);
+               led_trigger_event(psy->trig, LED_FULL);
                led_trigger_event(psy->charging_trig, LED_OFF);
                led_trigger_event(psy->full_trig, LED_FULL);
                /* Going from blink to LED on requires a LED_OFF event to stop blink */
@@ -103,7 +103,7 @@ static void power_supply_update_bat_leds(struct power_supply *psy)
                                     LED_FULL);
                break;
        case POWER_SUPPLY_STATUS_CHARGING:
-               led_trigger_event(psy->charging_full_trig, LED_FULL);
+               led_trigger_event(psy->trig, LED_FULL);
                led_trigger_event(psy->charging_trig, LED_FULL);
                led_trigger_event(psy->full_trig, LED_OFF);
                led_trigger_blink(psy->charging_blink_full_solid_trig, 0, 0);
@@ -113,7 +113,7 @@ static void power_supply_update_bat_leds(struct power_supply *psy)
                                     LED_FULL);
                break;
        default:
-               led_trigger_event(psy->charging_full_trig, LED_OFF);
+               led_trigger_event(psy->trig, LED_OFF);
                led_trigger_event(psy->charging_trig, LED_OFF);
                led_trigger_event(psy->full_trig, LED_OFF);
                led_trigger_event(psy->charging_blink_full_solid_trig,
@@ -126,7 +126,7 @@ static void power_supply_update_bat_leds(struct power_supply *psy)
 
 static void power_supply_remove_bat_triggers(struct power_supply *psy)
 {
-       power_supply_unregister_led_trigger(psy->charging_full_trig);
+       power_supply_unregister_led_trigger(psy->trig);
        power_supply_unregister_led_trigger(psy->charging_trig);
        power_supply_unregister_led_trigger(psy->full_trig);
        power_supply_unregister_led_trigger(psy->charging_blink_full_solid_trig);
@@ -138,7 +138,7 @@ static int power_supply_create_bat_triggers(struct power_supply *psy)
        int err = 0;
 
        power_supply_register_led_trigger(psy, "%s-charging-or-full",
-                                         &psy->charging_full_trig, &err);
+                                         &psy->trig, &err);
        power_supply_register_led_trigger(psy, "%s-charging",
                                          &psy->charging_trig, &err);
        power_supply_register_led_trigger(psy, "%s-full",
@@ -165,19 +165,19 @@ static void power_supply_update_gen_leds(struct power_supply *psy)
        dev_dbg(&psy->dev, "%s %d\n", __func__, online.intval);
 
        if (online.intval)
-               led_trigger_event(psy->online_trig, LED_FULL);
+               led_trigger_event(psy->trig, LED_FULL);
        else
-               led_trigger_event(psy->online_trig, LED_OFF);
+               led_trigger_event(psy->trig, LED_OFF);
 }
 
 static int power_supply_create_gen_triggers(struct power_supply *psy)
 {
-       return power_supply_register_led_trigger(psy, "%s-online", &psy->online_trig, NULL);
+       return power_supply_register_led_trigger(psy, "%s-online", &psy->trig, NULL);
 }
 
 static void power_supply_remove_gen_triggers(struct power_supply *psy)
 {
-       power_supply_unregister_led_trigger(psy->online_trig);
+       power_supply_unregister_led_trigger(psy->trig);
 }
 
 /* Choice what triggers to create&update. */

diff --git a/include/linux/power_supply.h b/include/linux/power_supply.h
index e218a8ab72eed60c061fb9babee8da6ca7584c23..65082ef75692a948d61501eb2baeaa0fdb28390d 100644 (file)
--- a/include/linux/power_supply.h
+++ b/include/linux/power_supply.h
@@ -309,10 +309,9 @@ struct power_supply {
 #endif
 
 #ifdef CONFIG_LEDS_TRIGGERS
-       struct led_trigger *charging_full_trig;
+       struct led_trigger *trig;
        struct led_trigger *charging_trig;
        struct led_trigger *full_trig;
-       struct led_trigger *online_trig;
        struct led_trigger *charging_blink_full_solid_trig;
        struct led_trigger *charging_orange_full_green_trig;
 #endif