From 8c593b6d7996919f723ffb3130b32e8b056a50a0 Mon Sep 17 00:00:00 2001
From: Haojian Zhuang <haojian.zhuang@marvell.com>
Date: Mon, 18 Apr 2011 22:04:08 +0800
Subject: [PATCH] --- yaml --- r: 251935 b: refs/heads/master c:
 2402ca5e300db0d88fce9e0b3a5218863c71b694 h: refs/heads/master i:   251933:
 1be57e996b0dd649c67cde3884c71c07817a100c   251931:
 08f10b8306bf75ea736a06680dee74e3cacfe940   251927:
 7d419ffa8425fd1a53fe5f73b48607059aab6a81   251919:
 193db43b3bc0c0683406556bd6882beffc2e8c32   251903:
 cf09b58786132a68f0f916de43b7e625fce062c7 v: v3

---
 [refs]                              |  2 +-
 trunk/drivers/power/max8925_power.c | 10 ++--------
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index 8d24e5c2d880..94cf68ef8fdd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e6f1945b9e71cbc8498e5fbf8d5352331ac5da14
+refs/heads/master: 2402ca5e300db0d88fce9e0b3a5218863c71b694
diff --git a/trunk/drivers/power/max8925_power.c b/trunk/drivers/power/max8925_power.c
index 8e5aec260866..a70e16d3a3dc 100644
--- a/trunk/drivers/power/max8925_power.c
+++ b/trunk/drivers/power/max8925_power.c
@@ -425,16 +425,11 @@ static __devexit int max8925_deinit_charger(struct max8925_power_info *info)
 static __devinit int max8925_power_probe(struct platform_device *pdev)
 {
 	struct max8925_chip *chip = dev_get_drvdata(pdev->dev.parent);
-	struct max8925_platform_data *max8925_pdata;
 	struct max8925_power_pdata *pdata = NULL;
 	struct max8925_power_info *info;
 	int ret;
 
-	if (pdev->dev.parent->platform_data) {
-		max8925_pdata = pdev->dev.parent->platform_data;
-		pdata = max8925_pdata->power;
-	}
-
+	pdata = pdev->dev.platform_data;
 	if (!pdata) {
 		dev_err(&pdev->dev, "platform data isn't assigned to "
 			"power supply\n");
@@ -447,6 +442,7 @@ static __devinit int max8925_power_probe(struct platform_device *pdev)
 	info->chip = chip;
 	info->gpm = chip->i2c;
 	info->adc = chip->adc;
+	platform_set_drvdata(pdev, info);
 
 	info->ac.name = "max8925-ac";
 	info->ac.type = POWER_SUPPLY_TYPE_MAINS;
@@ -482,8 +478,6 @@ static __devinit int max8925_power_probe(struct platform_device *pdev)
 	info->topoff_threshold = pdata->topoff_threshold;
 	info->fast_charge = pdata->fast_charge;
 	info->set_charger = pdata->set_charger;
-	dev_set_drvdata(&pdev->dev, info);
-	platform_set_drvdata(pdev, info);
 
 	max8925_init_charger(chip, info);
 	return 0;