aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorViresh Kumar <viresh.kumar@linaro.org>2014-09-04 08:01:36 -0400
committerSebastian Reichel <sre@kernel.org>2014-09-16 05:01:38 -0400
commit7195c505c2e8e2dd372f7b1737f2a788e74889fb (patch)
tree44484e99a487b039929336af33d31ca086c6d5c0
parent464069cae95f71ba670c7e3a90d919b18fb48d66 (diff)
power_supply: Don't iterate over devices to return -EPROBE_DEFER
This piece of code was added so that we return -EPROBE_DEFER when no devices are registered. But even if class_for_each_device() returns 0, we are going to return -EPROBE_DEFER only. And so this code isn't required at all. Remove it. Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org> Signed-off-by: Sebastian Reichel <sre@kernel.org>
-rw-r--r--drivers/power/power_supply_core.c13
1 files changed, 0 insertions, 13 deletions
diff --git a/drivers/power/power_supply_core.c b/drivers/power/power_supply_core.c
index 81177e299230..6cb7fe5c022d 100644
--- a/drivers/power/power_supply_core.c
+++ b/drivers/power/power_supply_core.c
@@ -179,19 +179,6 @@ static int __power_supply_find_supply_from_node(struct device *dev,
179static int power_supply_find_supply_from_node(struct device_node *supply_node) 179static int power_supply_find_supply_from_node(struct device_node *supply_node)
180{ 180{
181 int error; 181 int error;
182 struct device *dev;
183 struct class_dev_iter iter;
184
185 /*
186 * Use iterator to see if any other device is registered.
187 * This is required since class_for_each_device returns 0
188 * if there are no devices registered.
189 */
190 class_dev_iter_init(&iter, power_supply_class, NULL, NULL);
191 dev = class_dev_iter_next(&iter);
192
193 if (!dev)
194 return -EPROBE_DEFER;
195 182
196 /* 183 /*
197 * class_for_each_device() either returns its own errors or values 184 * class_for_each_device() either returns its own errors or values