From a4fd1ddf3cde5b4d15e0f67b77111e584683aab9 Mon Sep 17 00:00:00 2001
From: Lee Jones <lee.jones@linaro.org>
Date: Thu, 17 Jan 2013 16:08:42 +0000
Subject: [PATCH] --- yaml --- r: 350650 b: refs/heads/master c:
 97034a1e042d4316a83a3f68d61edf6c42e3f265 h: refs/heads/master v: v3

---
 [refs]                                     |  2 +-
 trunk/drivers/power/ab8500_charger.c       |  4 ++--
 trunk/include/linux/mfd/abx500.h           |  3 +++
 trunk/include/linux/mfd/abx500/ab8500-bm.h | 22 ----------------------
 4 files changed, 6 insertions(+), 25 deletions(-)

diff --git a/[refs] b/[refs]
index cf38387552b2..bc56eaac56da 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0ed5107fa86013c91b1752230d44b79dffee0cda
+refs/heads/master: 97034a1e042d4316a83a3f68d61edf6c42e3f265
diff --git a/trunk/drivers/power/ab8500_charger.c b/trunk/drivers/power/ab8500_charger.c
index 871bf5a7c42a..432f6bc48764 100644
--- a/trunk/drivers/power/ab8500_charger.c
+++ b/trunk/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 */
diff --git a/trunk/include/linux/mfd/abx500.h b/trunk/include/linux/mfd/abx500.h
index 0e6e90badfca..1beaa056f195 100644
--- a/trunk/include/linux/mfd/abx500.h
+++ b/trunk/include/linux/mfd/abx500.h
@@ -254,6 +254,9 @@ struct abx500_bm_data {
 	int usb_safety_tmr_h;
 	int bkup_bat_v;
 	int bkup_bat_i;
+	bool autopower_cfg;
+	bool ac_enabled;
+	bool usb_enabled;
 	bool no_maintenance;
 	bool capacity_scaling;
 	bool chg_unknown_bat;
diff --git a/trunk/include/linux/mfd/abx500/ab8500-bm.h b/trunk/include/linux/mfd/abx500/ab8500-bm.h
index ec796c700e4c..345bc159f978 100644
--- a/trunk/include/linux/mfd/abx500/ab8500-bm.h
+++ b/trunk/include/linux/mfd/abx500/ab8500-bm.h
@@ -404,28 +404,6 @@ struct ab8500_bm_data {
 	const struct ab8500_fg_parameters *fg_params;
 };
 
-struct ab8500_charger_platform_data {
-	char **supplied_to;
-	size_t num_supplicants;
-	bool autopower_cfg;
-	bool ac_enabled;
-	bool usb_enabled;
-};
-
-struct ab8500_btemp_platform_data {
-	char **supplied_to;
-	size_t num_supplicants;
-};
-
-struct ab8500_fg_platform_data {
-	char **supplied_to;
-	size_t num_supplicants;
-};
-
-struct ab8500_chargalg_platform_data {
-	char **supplied_to;
-	size_t num_supplicants;
-};
 struct ab8500_btemp;
 struct ab8500_gpadc;
 struct ab8500_fg;