From 3d6cf65cf42a10120bcf06019e70a9bdcb59fa85 Mon Sep 17 00:00:00 2001
From: Axel Lin <axel.lin@ingics.com>
Date: Sat, 27 Apr 2013 13:58:08 +0800
Subject: [PATCH] --- yaml --- r: 365127 b: refs/heads/master c:
 020501f1a0911af70873e4d3d122b2e1889ccd03 h: refs/heads/master i:   365125:
 c20f7c267510b5763b79f6a997b8b021f673879f   365123:
 3d241829401a1e36ade085073af66426c91b7557   365119:
 dbb181f3a69160d5d4ffcfb3b354f9910778841a v: v3

---
 [refs]                                       | 2 +-
 trunk/drivers/regulator/max1586.c            | 3 +--
 trunk/drivers/regulator/max8649.c            | 6 ++----
 trunk/drivers/regulator/max8660.c            | 3 +--
 trunk/drivers/regulator/s5m8767.c            | 6 ++----
 trunk/drivers/regulator/tps6524x-regulator.c | 3 +--
 6 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/[refs] b/[refs]
index 92ee74182237..2dead35d6a63 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1e4b545cdd93318379c6b1fb0a99536fa3260f53
+refs/heads/master: 020501f1a0911af70873e4d3d122b2e1889ccd03
diff --git a/trunk/drivers/regulator/max1586.c b/trunk/drivers/regulator/max1586.c
index 8c5a54f541b5..6b2217b404b2 100644
--- a/trunk/drivers/regulator/max1586.c
+++ b/trunk/drivers/regulator/max1586.c
@@ -232,8 +232,7 @@ static int max1586_pmic_remove(struct i2c_client *client)
 	int i;
 
 	for (i = 0; i <= MAX1586_V6; i++)
-		if (max1586->rdev[i])
-			regulator_unregister(max1586->rdev[i]);
+		regulator_unregister(max1586->rdev[i]);
 	return 0;
 }
 
diff --git a/trunk/drivers/regulator/max8649.c b/trunk/drivers/regulator/max8649.c
index 3ca14380f22d..f44427003611 100644
--- a/trunk/drivers/regulator/max8649.c
+++ b/trunk/drivers/regulator/max8649.c
@@ -275,10 +275,8 @@ static int max8649_regulator_remove(struct i2c_client *client)
 {
 	struct max8649_regulator_info *info = i2c_get_clientdata(client);
 
-	if (info) {
-		if (info->regulator)
-			regulator_unregister(info->regulator);
-	}
+	if (info)
+		regulator_unregister(info->regulator);
 
 	return 0;
 }
diff --git a/trunk/drivers/regulator/max8660.c b/trunk/drivers/regulator/max8660.c
index 4d7c635c36c2..d428ef9a626f 100644
--- a/trunk/drivers/regulator/max8660.c
+++ b/trunk/drivers/regulator/max8660.c
@@ -426,8 +426,7 @@ static int max8660_remove(struct i2c_client *client)
 	int i;
 
 	for (i = 0; i < MAX8660_V_END; i++)
-		if (max8660->rdev[i])
-			regulator_unregister(max8660->rdev[i]);
+		regulator_unregister(max8660->rdev[i]);
 	return 0;
 }
 
diff --git a/trunk/drivers/regulator/s5m8767.c b/trunk/drivers/regulator/s5m8767.c
index 8a831947c351..2dd74e254397 100644
--- a/trunk/drivers/regulator/s5m8767.c
+++ b/trunk/drivers/regulator/s5m8767.c
@@ -923,8 +923,7 @@ static int s5m8767_pmic_probe(struct platform_device *pdev)
 	return 0;
 err:
 	for (i = 0; i < s5m8767->num_regulators; i++)
-		if (rdev[i])
-			regulator_unregister(rdev[i]);
+		regulator_unregister(rdev[i]);
 
 	return ret;
 }
@@ -936,8 +935,7 @@ static int s5m8767_pmic_remove(struct platform_device *pdev)
 	int i;
 
 	for (i = 0; i < s5m8767->num_regulators; i++)
-		if (rdev[i])
-			regulator_unregister(rdev[i]);
+		regulator_unregister(rdev[i]);
 
 	return 0;
 }
diff --git a/trunk/drivers/regulator/tps6524x-regulator.c b/trunk/drivers/regulator/tps6524x-regulator.c
index 843ee0a9bb92..06e92761afdd 100644
--- a/trunk/drivers/regulator/tps6524x-regulator.c
+++ b/trunk/drivers/regulator/tps6524x-regulator.c
@@ -584,8 +584,7 @@ static int pmic_remove(struct spi_device *spi)
 	if (!hw)
 		return 0;
 	for (i = 0; i < N_REGULATORS; i++) {
-		if (hw->rdev[i])
-			regulator_unregister(hw->rdev[i]);
+		regulator_unregister(hw->rdev[i]);
 		hw->rdev[i] = NULL;
 	}
 	spi_set_drvdata(spi, NULL);