Commit df58c04c authored by Anton Vorontsov's avatar Anton Vorontsov

charger-manager: Simplify charger_get_property(), get rid of a warning

This patch fixes the following warning and makes the code a little
bit more simpler:

  CC      drivers/power/charger-manager.o
charger-manager.c: In function 'charger_get_property':
charger-manager.c:429:15: warning: 'i' may be used uninitialized in this function [-Wuninitialized]
Signed-off-by: default avatarAnton Vorontsov <anton.vorontsov@linaro.org>
parent bb2a95c2
...@@ -399,7 +399,8 @@ static int charger_get_property(struct power_supply *psy, ...@@ -399,7 +399,8 @@ static int charger_get_property(struct power_supply *psy,
struct charger_manager *cm = container_of(psy, struct charger_manager *cm = container_of(psy,
struct charger_manager, charger_psy); struct charger_manager, charger_psy);
struct charger_desc *desc = cm->desc; struct charger_desc *desc = cm->desc;
int i, ret = 0, uV; int ret = 0;
int uV;
switch (psp) { switch (psp) {
case POWER_SUPPLY_PROP_STATUS: case POWER_SUPPLY_PROP_STATUS:
...@@ -425,8 +426,7 @@ static int charger_get_property(struct power_supply *psy, ...@@ -425,8 +426,7 @@ static int charger_get_property(struct power_supply *psy,
val->intval = 0; val->intval = 0;
break; break;
case POWER_SUPPLY_PROP_VOLTAGE_NOW: case POWER_SUPPLY_PROP_VOLTAGE_NOW:
ret = get_batt_uV(cm, &i); ret = get_batt_uV(cm, &val->intval);
val->intval = i;
break; break;
case POWER_SUPPLY_PROP_CURRENT_NOW: case POWER_SUPPLY_PROP_CURRENT_NOW:
ret = cm->fuel_gauge->get_property(cm->fuel_gauge, ret = cm->fuel_gauge->get_property(cm->fuel_gauge,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment