diff options
Diffstat (limited to 'drivers/power/olpc_battery.c')
-rw-r--r-- | drivers/power/olpc_battery.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/drivers/power/olpc_battery.c b/drivers/power/olpc_battery.c index c998e68d060f..af7a231092a4 100644 --- a/drivers/power/olpc_battery.c +++ b/drivers/power/olpc_battery.c | |||
@@ -226,14 +226,6 @@ static int olpc_bat_get_property(struct power_supply *psy, | |||
226 | return ret; | 226 | return ret; |
227 | val->intval = ec_byte; | 227 | val->intval = ec_byte; |
228 | break; | 228 | break; |
229 | case POWER_SUPPLY_PROP_CAPACITY_LEVEL: | ||
230 | if (ec_byte & BAT_STAT_FULL) | ||
231 | val->intval = POWER_SUPPLY_CAPACITY_LEVEL_FULL; | ||
232 | else if (ec_byte & BAT_STAT_LOW) | ||
233 | val->intval = POWER_SUPPLY_CAPACITY_LEVEL_LOW; | ||
234 | else | ||
235 | val->intval = POWER_SUPPLY_CAPACITY_LEVEL_NORMAL; | ||
236 | break; | ||
237 | case POWER_SUPPLY_PROP_TEMP: | 229 | case POWER_SUPPLY_PROP_TEMP: |
238 | ret = olpc_ec_cmd(EC_BAT_TEMP, NULL, 0, (void *)&ec_word, 2); | 230 | ret = olpc_ec_cmd(EC_BAT_TEMP, NULL, 0, (void *)&ec_word, 2); |
239 | if (ret) | 231 | if (ret) |
@@ -265,7 +257,6 @@ static enum power_supply_property olpc_bat_props[] = { | |||
265 | POWER_SUPPLY_PROP_VOLTAGE_AVG, | 257 | POWER_SUPPLY_PROP_VOLTAGE_AVG, |
266 | POWER_SUPPLY_PROP_CURRENT_AVG, | 258 | POWER_SUPPLY_PROP_CURRENT_AVG, |
267 | POWER_SUPPLY_PROP_CAPACITY, | 259 | POWER_SUPPLY_PROP_CAPACITY, |
268 | POWER_SUPPLY_PROP_CAPACITY_LEVEL, | ||
269 | POWER_SUPPLY_PROP_TEMP, | 260 | POWER_SUPPLY_PROP_TEMP, |
270 | POWER_SUPPLY_PROP_TEMP_AMBIENT, | 261 | POWER_SUPPLY_PROP_TEMP_AMBIENT, |
271 | POWER_SUPPLY_PROP_MANUFACTURER, | 262 | POWER_SUPPLY_PROP_MANUFACTURER, |