From: Hans de Goede <hdegoede@redhat.com>
To: "Ilpo Järvinen" <ilpo.jarvinen@linux.intel.com>,
"Andy Shevchenko" <andy@kernel.org>,
"Pavel Machek" <pavel@ucw.cz>, "Lee Jones" <lee@kernel.org>,
"Kate Hsuan" <hpa@redhat.com>,
"Sebastian Reichel" <sre@kernel.org>
Cc: "Hans de Goede" <hdegoede@redhat.com>,
platform-driver-x86@vger.kernel.org,
"André Apitzsch" <git@apitzsch.eu>,
linux-leds@vger.kernel.org, linux-pm@vger.kernel.org
Subject: [PATCH 2/3] power: supply: power-supply-leds: Share trig pointer for online and charging_full
Date: Fri, 10 May 2024 21:40:11 +0200 [thread overview]
Message-ID: <20240510194012.138192-3-hdegoede@redhat.com> (raw)
In-Reply-To: <20240510194012.138192-1-hdegoede@redhat.com>
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>
---
drivers/power/supply/power_supply_leds.c | 18 +++++++++---------
include/linux/power_supply.h | 3 +--
2 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/drivers/power/supply/power_supply_leds.c b/drivers/power/supply/power_supply_leds.c
index 3e20b0f30aa3..634f7d33afd0 100644
--- a/drivers/power/supply/power_supply_leds.c
+++ b/drivers/power/supply/power_supply_leds.c
@@ -83,7 +83,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 */
@@ -95,7 +95,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);
@@ -105,7 +105,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,
@@ -118,7 +118,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);
@@ -130,7 +130,7 @@ static int power_supply_create_bat_triggers(struct power_supply *psy)
int err = 0;
err |= power_supply_register_led_trigger(psy, "%s-charging-or-full",
- &psy->charging_full_trig);
+ &psy->trig);
err |= power_supply_register_led_trigger(psy, "%s-charging",
&psy->charging_trig);
err |= power_supply_register_led_trigger(psy, "%s-full",
@@ -163,19 +163,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);
+ return power_supply_register_led_trigger(psy, "%s-online", &psy->trig);
}
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 e218a8ab72ee..65082ef75692 100644
--- 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
--
2.44.0
next prev parent reply other threads:[~2024-05-10 19:40 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-05-10 19:40 [PATCH 0/3] power: supply: power-supply-leds: Add activate() callback to triggers Hans de Goede
2024-05-10 19:40 ` [PATCH 1/3] power: supply: power-supply-leds: Add power_supply_[un]register_led_trigger() Hans de Goede
2024-05-10 20:04 ` Andy Shevchenko
2024-05-31 12:25 ` Hans de Goede
2024-05-10 19:40 ` Hans de Goede [this message]
2024-05-10 19:40 ` [PATCH 3/3] power: supply: power-supply-leds: Add activate() callback to triggers Hans de Goede
2024-05-10 20:07 ` Andy Shevchenko
2024-05-31 13:21 ` Hans de Goede
2024-05-27 21:37 ` [PATCH 0/3] " Sebastian Reichel
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240510194012.138192-3-hdegoede@redhat.com \
--to=hdegoede@redhat.com \
--cc=andy@kernel.org \
--cc=git@apitzsch.eu \
--cc=hpa@redhat.com \
--cc=ilpo.jarvinen@linux.intel.com \
--cc=lee@kernel.org \
--cc=linux-leds@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=pavel@ucw.cz \
--cc=platform-driver-x86@vger.kernel.org \
--cc=sre@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).