diff options
| author | Jonghwa Lee <jonghwa3.lee@samsung.com> | 2014-10-20 14:14:53 +0900 |
|---|---|---|
| committer | Chanho Park <chanho61.park@samsung.com> | 2014-11-18 12:01:01 +0900 |
| commit | 3f3fe57eb7cce99279a91e666fdb2da7815ba963 (patch) | |
| tree | 6d61f2ab8dffe881bd3ce28f1f717a0f18af76e5 | |
| parent | d606d7352c025a2f43211ef30bd7e113c552c4df (diff) | |
| download | linux-3.10-3f3fe57eb7cce99279a91e666fdb2da7815ba963.tar.gz linux-3.10-3f3fe57eb7cce99279a91e666fdb2da7815ba963.tar.bz2 linux-3.10-3f3fe57eb7cce99279a91e666fdb2da7815ba963.zip | |
power: charger-manager: Concentrate scattered power_supply_changed() calls.
Current charger-manager calls power_suuply_changed() whenever charging
status is changed. This patch removes seperated power_supply_changed()
use and let it be called at end of try_charger_enable() function which
is called to set charging/discharging.
Change-Id: I98c823268207a891fba9d38dc71692e2e0791ae7
Signed-off-by: Jonghwa Lee <jonghwa3.lee@samsung.com>
| -rw-r--r-- | drivers/power/charger-manager.c | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/drivers/power/charger-manager.c b/drivers/power/charger-manager.c index 04b170d984c..774f9cb6dcc 100644 --- a/drivers/power/charger-manager.c +++ b/drivers/power/charger-manager.c @@ -360,8 +360,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; } @@ -414,10 +416,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); - } } /** @@ -447,7 +447,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; } @@ -458,7 +457,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; } @@ -536,8 +534,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 discharing duration @@ -562,16 +559,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); } } |