diff options
| author | Anton Vorontsov <anton.vorontsov@linaro.org> | 2012-03-14 04:38:32 +0400 |
|---|---|---|
| committer | Anton Vorontsov <anton.vorontsov@linaro.org> | 2012-03-26 20:41:10 +0400 |
| commit | 450ceb2b23ed0feba8c1238f52a1d3feacd5379d (patch) | |
| tree | 47749b9fe2189e7f1a8d18653db6eedd43a51e5c | |
| parent | d329129e9e10e3089550fd9bd692f67687503136 (diff) | |
| download | linux-stable-450ceb2b23ed0feba8c1238f52a1d3feacd5379d.tar.gz linux-stable-450ceb2b23ed0feba8c1238f52a1d3feacd5379d.tar.bz2 linux-stable-450ceb2b23ed0feba8c1238f52a1d3feacd5379d.zip | |
ab8500_fg: Get rid of 'struct v_to_cap'
The struct is duplicated, plus when used it causes the following
warnings:
CHECK drivers/power/ab8500_fg.c
ab8500_fg.c:818:13: warning: incorrect type in assignment (different base types)
ab8500_fg.c:818:13: expected struct v_to_cap *tbl
ab8500_fg.c:818:13: got struct abx500_v_to_cap *const v_to_cap_tbl
CC drivers/power/ab8500_fg.o
ab8500_fg.c: In function 'ab8500_fg_volt_to_capacity':
ab8500_fg.c:818:6: warning: assignment from incompatible pointer type [enabled by default]
Signed-off-by: Anton Vorontsov <anton.vorontsov@linaro.org>
| -rw-r--r-- | drivers/power/ab8500_fg.c | 2 | ||||
| -rw-r--r-- | include/linux/mfd/abx500/ab8500-bm.h | 10 |
2 files changed, 1 insertions, 11 deletions
diff --git a/drivers/power/ab8500_fg.c b/drivers/power/ab8500_fg.c index 41ccb70d4018..180c21ad6800 100644 --- a/drivers/power/ab8500_fg.c +++ b/drivers/power/ab8500_fg.c @@ -812,7 +812,7 @@ static int ab8500_fg_bat_voltage(struct ab8500_fg *di) static int ab8500_fg_volt_to_capacity(struct ab8500_fg *di, int voltage) { int i, tbl_size; - struct v_to_cap *tbl; + struct abx500_v_to_cap *tbl; int cap = 0; tbl = di->bat->bat_type[di->bat->batt_id].v_to_cap_tbl, diff --git a/include/linux/mfd/abx500/ab8500-bm.h b/include/linux/mfd/abx500/ab8500-bm.h index f61b7b981ce2..44d86206a253 100644 --- a/include/linux/mfd/abx500/ab8500-bm.h +++ b/include/linux/mfd/abx500/ab8500-bm.h @@ -255,16 +255,6 @@ struct batres_vs_temp { int resist; }; -/** - * struct v_to_cap - Table for translating voltage to capacity - * @voltage: Voltage in mV - * @capacity: Capacity in percent - */ -struct v_to_cap { - int voltage; - int capacity; -}; - /* Forward declaration */ struct ab8500_fg; |