From 608de995c75175c107830c49e03825e1692ca4dd Mon Sep 17 00:00:00 2001
From: Lee Jones <lee.jones@linaro.org>
Date: Fri, 30 Nov 2012 10:57:14 +0000
Subject: [PATCH] --- yaml --- r: 350589 b: refs/heads/master c:
 bdc56b44038e1472d24c9195337226b8d6f2961e h: refs/heads/master i:   350587:
 0ed4f8e2f8a3894a14589b244a60ea41d28abfaa v: v3

---
 [refs]                                |  2 +-
 trunk/drivers/power/abx500_chargalg.c | 27 +++++++++++++--------------
 2 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/[refs] b/[refs]
index 70d50e456db5..eaa9187bcdad 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 195c1c660c1868ac2024ad0ee3d5dce49bde4488
+refs/heads/master: bdc56b44038e1472d24c9195337226b8d6f2961e
diff --git a/trunk/drivers/power/abx500_chargalg.c b/trunk/drivers/power/abx500_chargalg.c
index 22a511c2a719..a8acfe5b863f 100644
--- a/trunk/drivers/power/abx500_chargalg.c
+++ b/trunk/drivers/power/abx500_chargalg.c
@@ -1806,6 +1806,7 @@ static char *supply_interface[] = {
 static int __devinit abx500_chargalg_probe(struct platform_device *pdev)
 {
 	struct device_node *np = pdev->dev.of_node;
+	struct abx500_bm_data *plat = pdev->dev.platform_data;
 	struct abx500_chargalg *di;
 	int ret = 0;
 
@@ -1814,21 +1815,19 @@ static int __devinit abx500_chargalg_probe(struct platform_device *pdev)
 		dev_err(&pdev->dev, "%s no mem for ab8500_chargalg\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;
-			}
-		} else {
-			dev_err(&pdev->dev, "missing dt node for ab8500_chargalg\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");
 	}
 
 	/* get device struct */