summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGimcuan Hui <gimcuan@gmail.com>2017-11-11 06:52:54 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-12-18 16:47:27 +0100
commit93ead7c9483c6d7ae0f67ae6d0a5d3966d84bec8 (patch)
treeaa5df925bfd023273f4d5de96dfbb20cd405239f
parentMerge 4.15-rc3 into driver-core-next (diff)
downloadlinux-93ead7c9483c6d7ae0f67ae6d0a5d3966d84bec8.tar.xz
linux-93ead7c9483c6d7ae0f67ae6d0a5d3966d84bec8.zip
drivers: base: omit redundant interations
When error happens, these interators return the error, no interation should be continued, so make the change for getting out of while immediately. Signed-off-by: Gimcuan Hui <gimcuan@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/base/bus.c2
-rw-r--r--drivers/base/core.c2
-rw-r--r--drivers/base/driver.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/drivers/base/bus.c b/drivers/base/bus.c
index 6c63e1abbdcc..ef6183306b40 100644
--- a/drivers/base/bus.c
+++ b/drivers/base/bus.c
@@ -307,7 +307,7 @@ int bus_for_each_dev(struct bus_type *bus, struct device *start,
klist_iter_init_node(&bus->p->klist_devices, &i,
(start ? &start->p->knode_bus : NULL));
- while ((dev = next_device(&i)) && !error)
+ while (!error && (dev = next_device(&i)))
error = fn(dev, data);
klist_iter_exit(&i);
return error;
diff --git a/drivers/base/core.c b/drivers/base/core.c
index bf45587bcb46..61515ef91184 100644
--- a/drivers/base/core.c
+++ b/drivers/base/core.c
@@ -2114,7 +2114,7 @@ int device_for_each_child(struct device *parent, void *data,
return 0;
klist_iter_init(&parent->p->klist_children, &i);
- while ((child = next_device(&i)) && !error)
+ while (!error && (child = next_device(&i)))
error = fn(child, data);
klist_iter_exit(&i);
return error;
diff --git a/drivers/base/driver.c b/drivers/base/driver.c
index 4e20d68edb0d..ba912558a510 100644
--- a/drivers/base/driver.c
+++ b/drivers/base/driver.c
@@ -50,7 +50,7 @@ int driver_for_each_device(struct device_driver *drv, struct device *start,
klist_iter_init_node(&drv->p->klist_devices, &i,
start ? &start->p->knode_driver : NULL);
- while ((dev = next_device(&i)) && !error)
+ while (!error && (dev = next_device(&i)))
error = fn(dev, data);
klist_iter_exit(&i);
return error;