summaryrefslogtreecommitdiffstats
path: root/drivers/power
diff options
context:
space:
mode:
authorLee Jones <lee.jones@linaro.org>2013-01-17 16:08:42 +0000
committerLee Jones <lee.jones@linaro.org>2013-01-23 14:39:21 +0000
commit97034a1e042d4316a83a3f68d61edf6c42e3f265 (patch)
treeacf4400657be33c5de4a4b029818f0f180aafaf2 /drivers/power
parent0ed5107fa86013c91b1752230d44b79dffee0cda (diff)
downloadop-kernel-dev-97034a1e042d4316a83a3f68d61edf6c42e3f265.zip
op-kernel-dev-97034a1e042d4316a83a3f68d61edf6c42e3f265.tar.gz
ab8500-bm: Remove individual [charger|btemp|fg|chargalg] pdata structures
None of the aforementioned components have their own dedicated platform data structures anymore. Instead they have all been merged into one big Battery Management container. Let's remove them and place all the nice newly added attributes into the core container. Signed-off-by: Lee Jones <lee.jones@linaro.org>
Diffstat (limited to 'drivers/power')
-rw-r--r--drivers/power/ab8500_charger.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/power/ab8500_charger.c b/drivers/power/ab8500_charger.c
index 871bf5a..432f6bc 100644
--- a/drivers/power/ab8500_charger.c
+++ b/drivers/power/ab8500_charger.c
@@ -2998,7 +2998,7 @@ static int ab8500_charger_probe(struct platform_device *pdev)
di->ac_chg.max_out_curr = ab8500_charger_current_map[
ARRAY_SIZE(ab8500_charger_current_map) - 1];
di->ac_chg.wdt_refresh = CHG_WD_INTERVAL;
- di->ac_chg.enabled = di->pdata->ac_enabled;
+ di->ac_chg.enabled = di->bm->ac_enabled;
di->ac_chg.external = false;
/* USB supply */
@@ -3019,7 +3019,7 @@ static int ab8500_charger_probe(struct platform_device *pdev)
di->usb_chg.max_out_curr = ab8500_charger_current_map[
ARRAY_SIZE(ab8500_charger_current_map) - 1];
di->usb_chg.wdt_refresh = CHG_WD_INTERVAL;
- di->usb_chg.enabled = di->pdata->usb_enabled;
+ di->usb_chg.enabled = di->bm->usb_enabled;
di->usb_chg.external = false;
/* Create a work queue for the charger */
OpenPOWER on IntegriCloud