power: supply: charger-manager: Always use POWER_SUPPLY_PROP_TEMP

We were using POWER_SUPPLY_PROP_TEMP if the temperature was coming
via the fuel gauge and POWER_SUPPLY_PROP_TEMP_AMBIENT if it was
coming via the thermal framework.  Since they're mutually
exclusive in the driver and we don't know if the thermal framework
 is ambient or not, unify them both to use POWER_SUPPLY_PROP_TEMP.

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 c18dc8d3ae1c6dfc70739e02b3fb5a0d10f3e977..1edeb5625f29db9f27dae73b8259c9b0a6df6dff 100644 (file)
--- a/drivers/power/supply/charger-manager.c
+++ b/drivers/power/supply/charger-manager.c
@@ -791,7 +791,6 @@ static int charger_get_property(struct power_supply *psy,
                                POWER_SUPPLY_PROP_CURRENT_NOW, val);
                break;
        case POWER_SUPPLY_PROP_TEMP:
-       case POWER_SUPPLY_PROP_TEMP_AMBIENT:
                return cm_get_battery_temperature(cm, &val->intval);
        case POWER_SUPPLY_PROP_CAPACITY:
                if (!is_batt_present(cm)) {
@@ -899,8 +898,7 @@ static enum power_supply_property default_charger_props[] = {
         * Optional properties are:
         * POWER_SUPPLY_PROP_CHARGE_NOW,
         * POWER_SUPPLY_PROP_CURRENT_NOW,
-        * POWER_SUPPLY_PROP_TEMP, and
-        * POWER_SUPPLY_PROP_TEMP_AMBIENT,
+        * POWER_SUPPLY_PROP_TEMP,
         */
 };
 
@@ -1298,7 +1296,7 @@ static int cm_init_thermal_data(struct charger_manager *cm,
                        return PTR_ERR(cm->tzd_batt);
 
                /* Use external thermometer */
-               properties[*num_properties] = POWER_SUPPLY_PROP_TEMP_AMBIENT;
+               properties[*num_properties] = POWER_SUPPLY_PROP_TEMP;
                (*num_properties)++;
                cm->desc->measure_battery_temp = true;
                ret = 0;