summaryrefslogtreecommitdiff
path: root/drivers/power
diff options
context:
space:
mode:
authorAnton Vorontsov <anton.vorontsov@linaro.org>2012-03-14 04:39:01 +0400
committerAnton Vorontsov <anton.vorontsov@linaro.org>2012-03-26 20:41:11 +0400
commitc34a61b4e7a9966edc0e87d7b0a12fbb8cc58168 (patch)
tree1c347755b106d0b6663caf9447b3b3d35ce6ff84 /drivers/power
parent450ceb2b23ed0feba8c1238f52a1d3feacd5379d (diff)
downloadlinux-c34a61b4e7a9966edc0e87d7b0a12fbb8cc58168.tar.xz
ab8500_fg: Get rid of 'struct battery_type'
The struct is duplicated, plus causes the following flood: CC drivers/power/ab8500_fg.o ab8500_fg.c: In function ‘ab8500_fg_get_ext_psy_data’: b8500_fg.c:2081:8: warning: assignment from incompatible pointer type [enabled by default] Signed-off-by: Anton Vorontsov <anton.vorontsov@linaro.org>
Diffstat (limited to 'drivers/power')
-rw-r--r--drivers/power/ab8500_fg.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/power/ab8500_fg.c b/drivers/power/ab8500_fg.c
index 180c21ad6800..b7e12c8af8cd 100644
--- a/drivers/power/ab8500_fg.c
+++ b/drivers/power/ab8500_fg.c
@@ -2077,7 +2077,8 @@ static int ab8500_fg_get_ext_psy_data(struct device *dev, void *data)
switch (ext->type) {
case POWER_SUPPLY_TYPE_BATTERY:
if (!di->flags.batt_id_received) {
- const struct battery_type *b;
+ const struct abx500_battery_type *b;
+
b = &(di->bat->bat_type[di->bat->batt_id]);
di->flags.batt_id_received = true;