From: Jonathan Bakker <xc-racer2@live.ca>
To: sre@kernel.org, krzk@kernel.org, jonghwa3.lee@samsung.com,
tglx@linutronix.de, kstewart@linuxfoundation.org,
baolin.wang7@gmail.com, linux-pm@vger.kernel.org,
devicetree@vger.kernel.org, linux-kernel@vger.kernel.org
Cc: Krzysztof Kozlowski <k.kozlowski@samsung.com>,
Jonathan Bakker <xc-racer2@live.ca>
Subject: [PATCH 05/10] power: supply: charger-manager: Collect all power_supply_changed() calls
Date: Thu, 14 May 2020 16:04:30 -0700 [thread overview]
Message-ID: <BN6PR04MB0660E53EFF098B66C32D9ACBA3BC0@BN6PR04MB0660.namprd04.prod.outlook.com> (raw)
In-Reply-To: <20200514230435.11798-1-xc-racer2@live.ca>
From: Jonghwa Lee <jonghwa3.lee@samsung.com>
Current charger-manager calls power_supply_changed() whenever charging
status is changed. Remove the separated power_supply_changed() calls
and let it be called at end of try_charger_enable() function which
is called to set charging/discharging.
Signed-off-by: Jonghwa Lee <jonghwa3.lee@samsung.com>
Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
Signed-off-by: Jonathan Bakker <xc-racer2@live.ca>
---
drivers/power/supply/charger-manager.c | 18 ++++++------------
1 file changed, 6 insertions(+), 12 deletions(-)
diff --git a/drivers/power/supply/charger-manager.c b/drivers/power/supply/charger-manager.c
index 80d1699c938a..b2daab480eb3 100644
--- a/drivers/power/supply/charger-manager.c
+++ b/drivers/power/supply/charger-manager.c
@@ -406,8 +406,10 @@ static int try_charger_enable(struct charger_manager *cm, bool enable)
}
}
- if (!err)
+ if (!err) {
cm->charger_enabled = enable;
+ power_supply_changed(cm->charger_psy);
+ }
return err;
}
@@ -460,10 +462,8 @@ static void fullbatt_vchk(struct charger_manager *cm)
dev_info(cm->dev, "VBATT dropped %duV after full-batt\n", diff);
- if (diff > desc->fullbatt_vchkdrop_uV) {
+ if (diff > desc->fullbatt_vchkdrop_uV)
try_charger_restart(cm);
- power_supply_changed(cm->charger_psy);
- }
}
/**
@@ -493,7 +493,6 @@ static int check_charging_duration(struct charger_manager *cm)
if (duration > desc->charging_max_duration_ms) {
dev_info(cm->dev, "Charging duration exceed %ums\n",
desc->charging_max_duration_ms);
- power_supply_changed(cm->charger_psy);
try_charger_enable(cm, false);
ret = true;
}
@@ -504,7 +503,6 @@ static int check_charging_duration(struct charger_manager *cm)
is_ext_pwr_online(cm)) {
dev_info(cm->dev, "Discharging duration exceed %ums\n",
desc->discharging_max_duration_ms);
- power_supply_changed(cm->charger_psy);
try_charger_enable(cm, true);
ret = true;
}
@@ -613,8 +611,7 @@ static bool _cm_monitor(struct charger_manager *cm)
*/
if (temp_alrt) {
cm->emergency_stop = temp_alrt;
- if (!try_charger_enable(cm, false))
- power_supply_changed(cm->charger_psy);
+ try_charger_enable(cm, false);
/*
* Check whole charging duration and discharging duration
@@ -639,16 +636,13 @@ static bool _cm_monitor(struct charger_manager *cm)
} else if (!cm->emergency_stop && is_full_charged(cm) &&
cm->charger_enabled) {
dev_info(cm->dev, "EVENT_HANDLE: Battery Fully Charged\n");
- power_supply_changed(cm->charger_psy);
-
try_charger_enable(cm, false);
fullbatt_vchk(cm);
} else {
cm->emergency_stop = 0;
if (is_ext_pwr_online(cm)) {
- if (!try_charger_enable(cm, true))
- power_supply_changed(cm->charger_psy);
+ try_charger_enable(cm, true);
}
}
--
2.20.1
next prev parent reply other threads:[~2020-05-14 23:05 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20200514230435.11798-1-xc-racer2@live.ca>
2020-05-14 23:04 ` [PATCH 01/10] power: supply: charger-manager: Swap private uevent for power_supply_changed Jonathan Bakker
2020-05-14 23:04 ` [PATCH 02/10] power: supply: charger-manager: Remove cm_notify_event function Jonathan Bakker
2020-05-14 23:04 ` [PATCH 03/10] power: supply: charger-manager: Always use POWER_SUPPLY_PROP_TEMP Jonathan Bakker
2020-05-14 23:04 ` [PATCH 04/10] power: supply: charger-manager: Correct usage of CHARGE_NOW/FULL Jonathan Bakker
2020-05-14 23:04 ` Jonathan Bakker [this message]
2020-05-14 23:04 ` [PATCH 06/10] power: supply: charger-manager: Make decisions focussed on battery status Jonathan Bakker
2020-05-14 23:04 ` [PATCH 07/10] power: supply: charger-manager: Don't start charging in cable nofitication Jonathan Bakker
2020-05-14 23:04 ` [PATCH 08/10] power: supply: charger-manager: Update extcon functions Jonathan Bakker
2020-05-14 23:04 ` [PATCH 09/10] power: supply: charger-manager: Count cm-chargers property directly Jonathan Bakker
2020-05-14 23:04 ` [PATCH 10/10] dt-bindings: power: supply: Cleanup charger-manager bindings Jonathan Bakker
2020-05-28 17:54 ` Rob Herring
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=BN6PR04MB0660E53EFF098B66C32D9ACBA3BC0@BN6PR04MB0660.namprd04.prod.outlook.com \
--to=xc-racer2@live.ca \
--cc=baolin.wang7@gmail.com \
--cc=devicetree@vger.kernel.org \
--cc=jonghwa3.lee@samsung.com \
--cc=k.kozlowski@samsung.com \
--cc=krzk@kernel.org \
--cc=kstewart@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=sre@kernel.org \
--cc=tglx@linutronix.de \
/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 NNTP newsgroup(s).