|
@@ -296,12 +296,13 @@ static int set_charging_fsm(struct pm860x_charger_info *info)
|
|
psy = power_supply_get_by_name(pm860x_supplied_to[0]);
|
|
psy = power_supply_get_by_name(pm860x_supplied_to[0]);
|
|
if (!psy)
|
|
if (!psy)
|
|
return -EINVAL;
|
|
return -EINVAL;
|
|
- ret = psy->get_property(psy, POWER_SUPPLY_PROP_VOLTAGE_NOW, &data);
|
|
|
|
|
|
+ ret = power_supply_get_property(psy, POWER_SUPPLY_PROP_VOLTAGE_NOW,
|
|
|
|
+ &data);
|
|
if (ret)
|
|
if (ret)
|
|
return ret;
|
|
return ret;
|
|
vbatt = data.intval / 1000;
|
|
vbatt = data.intval / 1000;
|
|
|
|
|
|
- ret = psy->get_property(psy, POWER_SUPPLY_PROP_PRESENT, &data);
|
|
|
|
|
|
+ ret = power_supply_get_property(psy, POWER_SUPPLY_PROP_PRESENT, &data);
|
|
if (ret)
|
|
if (ret)
|
|
return ret;
|
|
return ret;
|
|
|
|
|
|
@@ -430,7 +431,7 @@ static irqreturn_t pm860x_temp_handler(int irq, void *data)
|
|
psy = power_supply_get_by_name(pm860x_supplied_to[0]);
|
|
psy = power_supply_get_by_name(pm860x_supplied_to[0]);
|
|
if (!psy)
|
|
if (!psy)
|
|
goto out;
|
|
goto out;
|
|
- ret = psy->get_property(psy, POWER_SUPPLY_PROP_TEMP, &temp);
|
|
|
|
|
|
+ ret = power_supply_get_property(psy, POWER_SUPPLY_PROP_TEMP, &temp);
|
|
if (ret)
|
|
if (ret)
|
|
goto out;
|
|
goto out;
|
|
value = temp.intval / 10;
|
|
value = temp.intval / 10;
|
|
@@ -485,7 +486,8 @@ static irqreturn_t pm860x_done_handler(int irq, void *data)
|
|
psy = power_supply_get_by_name(pm860x_supplied_to[0]);
|
|
psy = power_supply_get_by_name(pm860x_supplied_to[0]);
|
|
if (!psy)
|
|
if (!psy)
|
|
goto out;
|
|
goto out;
|
|
- ret = psy->get_property(psy, POWER_SUPPLY_PROP_VOLTAGE_NOW, &val);
|
|
|
|
|
|
+ ret = power_supply_get_property(psy, POWER_SUPPLY_PROP_VOLTAGE_NOW,
|
|
|
|
+ &val);
|
|
if (ret)
|
|
if (ret)
|
|
goto out;
|
|
goto out;
|
|
vbatt = val.intval / 1000;
|
|
vbatt = val.intval / 1000;
|
|
@@ -500,7 +502,8 @@ static irqreturn_t pm860x_done_handler(int irq, void *data)
|
|
if (ret < 0)
|
|
if (ret < 0)
|
|
goto out;
|
|
goto out;
|
|
if (vbatt > CHARGE_THRESHOLD && ret & STATUS2_CHG)
|
|
if (vbatt > CHARGE_THRESHOLD && ret & STATUS2_CHG)
|
|
- psy->set_property(psy, POWER_SUPPLY_PROP_CHARGE_FULL, &val);
|
|
|
|
|
|
+ power_supply_set_property(psy, POWER_SUPPLY_PROP_CHARGE_FULL,
|
|
|
|
+ &val);
|
|
|
|
|
|
out:
|
|
out:
|
|
mutex_unlock(&info->lock);
|
|
mutex_unlock(&info->lock);
|