From 0ed4f8e2f8a3894a14589b244a60ea41d28abfaa Mon Sep 17 00:00:00 2001
From: Lee Jones <lee.jones@linaro.org>
Date: Fri, 30 Nov 2012 10:56:28 +0000
Subject: [PATCH] --- yaml --- r: 350587 b: refs/heads/master c:
 7722b79964f0b1d7909eb7ef69632d73b07ca6a3 h: refs/heads/master i:   350585:
 a8c78c255d2105d6c9699aa7136ccf8b11ed536e   350583:
 d2aa4a55dff1d02b8a47b0fb947e7b6886232400 v: v3

---
 [refs]                               |  2 +-
 trunk/drivers/power/ab8500_charger.c | 31 ++++++++++++++--------------
 2 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/[refs] b/[refs]
index 154721aeee7b..a4cda51aeb87 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 95820245edf93c9cd464004db8b52a4b690637a3
+refs/heads/master: 7722b79964f0b1d7909eb7ef69632d73b07ca6a3
diff --git a/trunk/drivers/power/ab8500_charger.c b/trunk/drivers/power/ab8500_charger.c
index c1077df26783..2ddface4b2c4 100644
--- a/trunk/drivers/power/ab8500_charger.c
+++ b/trunk/drivers/power/ab8500_charger.c
@@ -2636,6 +2636,7 @@ static char *supply_interface[] = {
 static int __devinit ab8500_charger_probe(struct platform_device *pdev)
 {
 	struct device_node *np = pdev->dev.of_node;
+	struct abx500_bm_data *plat = pdev->dev.platform_data;
 	struct ab8500_charger *di;
 	int irq, i, charger_status, ret = 0;
 
@@ -2644,24 +2645,22 @@ static int __devinit ab8500_charger_probe(struct platform_device *pdev)
 		dev_err(&pdev->dev, "%s no mem for ab8500_charger\n", __func__);
 		return -ENOMEM;
 	}
-	di->bm = pdev->mfd_cell->platform_data;
-	if (!di->bm) {
-		if (np) {
-			ret = ab8500_bm_of_probe(&pdev->dev, np, di->bm);
-			if (ret) {
-				dev_err(&pdev->dev,
-					"failed to get battery information\n");
-				return ret;
-			}
-			di->autopower_cfg = of_property_read_bool(np, "autopower_cfg");
-		} else {
-			dev_err(&pdev->dev, "missing dt node for ab8500_charger\n");
-			return -EINVAL;
+
+	if (!plat) {
+		dev_err(&pdev->dev, "no battery management data supplied\n");
+		return -EINVAL;
+	}
+	di->bm = plat;
+
+	if (np) {
+		ret = ab8500_bm_of_probe(&pdev->dev, np, di->bm);
+		if (ret) {
+			dev_err(&pdev->dev, "failed to get battery information\n");
+			return ret;
 		}
-	} else {
-		dev_info(&pdev->dev, "falling back to legacy platform data\n");
+		di->autopower_cfg = of_property_read_bool(np, "autopower_cfg");
+	} else
 		di->autopower_cfg = false;
-	}
 
 	/* get parent data */
 	di->dev = &pdev->dev;