diff options
| author | Dan Willemsen <dwillemsen@nvidia.com> | 2011-10-18 14:33:48 -0700 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@nvidia.com> | 2011-11-30 21:49:15 -0800 |
| commit | 0639b3a001749751fc9dc0369311189f37d597f1 (patch) | |
| tree | 747d1b1d8ce757c02ae36208862f71d65af9934d /drivers/power | |
| parent | 0fb055b420efbac32cd32ad834d179e1ad9df38b (diff) | |
power: bq27x00: Remove extra CYCLE_COUNT
CYCLE_COUNT was added upstream in 3.0
Signed-off-by: Dan Willemsen <dwillemsen@nvidia.com>
Rebase-Id: R5d0decc5408671c59c11f3367a8a2a9bfa6d8583
Diffstat (limited to 'drivers/power')
| -rw-r--r-- | drivers/power/bq27x00_battery.c | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/drivers/power/bq27x00_battery.c b/drivers/power/bq27x00_battery.c index 8450087a17c8..fc2923dc03d6 100644 --- a/drivers/power/bq27x00_battery.c +++ b/drivers/power/bq27x00_battery.c @@ -72,7 +72,6 @@ #define BQ27510_ATRATE 0x02 #define BQ27510_ENERGY_AVAIL 0x22 #define BQ27510_POWER_AVG 0x24 -#define BQ27510_CYCLE_COUNT 0x2a /* bq27510-g2 control register sub-commands*/ #define BQ27510_CNTL_DEVICE_TYPE 0x0001 @@ -139,7 +138,6 @@ static enum power_supply_property bq27x00_battery_props[] = { POWER_SUPPLY_PROP_CYCLE_COUNT, POWER_SUPPLY_PROP_ENERGY_NOW, POWER_SUPPLY_PROP_POWER_AVG, - POWER_SUPPLY_PROP_CYCLE_COUNT, POWER_SUPPLY_PROP_SERIAL_NUMBER, POWER_SUPPLY_PROP_HEALTH, }; @@ -550,21 +548,6 @@ static int bq27510_battery_power_avg(struct bq27x00_device_info *di, return -1; } -static int bq27510_battery_cycle_count(struct bq27x00_device_info *di, - int reg_offset) -{ - int ret; - - if (di->chip == BQ27510) { - ret = bq27x00_read(di, reg_offset, false); - if (ret < 0) - dev_err(di->dev, "read failure\n"); - return ret; - } else { - return -1; - } -} - #define to_bq27x00_device_info(x) container_of((x), \ struct bq27x00_device_info, bat); @@ -634,10 +617,6 @@ static int bq27x00_battery_get_property(struct power_supply *psy, case POWER_SUPPLY_PROP_POWER_AVG: ret = bq27510_battery_power_avg(di, val); break; - case POWER_SUPPLY_PROP_CYCLE_COUNT: - val->intval = bq27510_battery_cycle_count(di, - BQ27510_CYCLE_COUNT); - break; case POWER_SUPPLY_PROP_SERIAL_NUMBER: if (bq27510_get_battery_serial_number(di, val)) return -EINVAL; |