power: supply: charger-manager: Collect all power_supply_changed() calls

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>
Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>

diff --git a/drivers/power/supply/charger-manager.c b/drivers/power/supply/charger-manager.c
index 34817df76020b72c135bb0a07dfd317c6855c30c..cc8feb68694d3de63193564590349abf11890970 100644 (file)
--- 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);
                }
        }