Merge tag 'pm+acpi-for-3.8-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git...

[~andy/linux] / drivers / base / class.c

diff --git a/drivers/base/class.c b/drivers/base/class.c
index 23dbc661d4a07d830be7f085aa8338fa34b411e3..03243d4002fd5e995dd198447e98a9d2343fd89d 100644 (file)
--- a/drivers/base/class.c
+++ b/drivers/base/class.c
@@ -301,20 +301,15 @@ void class_destroy(struct class *cls)
  * otherwise if it is NULL, the iteration starts at the beginning of
  * the list.
  */
-int class_dev_iter_init(struct class_dev_iter *iter, struct class *class,
-                       struct device *start, const struct device_type *type)
+void class_dev_iter_init(struct class_dev_iter *iter, struct class *class,
+                        struct device *start, const struct device_type *type)
 {
        struct klist_node *start_knode = NULL;
-       int error;
 
        if (start)
                start_knode = &start->knode_class;
-       error = klist_iter_init_node(&class->p->klist_devices, &iter->ki,
-                                    start_knode);
-       if (!error)
-               iter->type = type;
-
-       return error;
+       klist_iter_init_node(&class->p->klist_devices, &iter->ki, start_knode);
+       iter->type = type;
 }
 EXPORT_SYMBOL_GPL(class_dev_iter_init);
 
@@ -392,15 +387,14 @@ int class_for_each_device(struct class *class, struct device *start,
                return -EINVAL;
        }
 
-       error = class_dev_iter_init(&iter, class, start, NULL);
-       if (!error) {
-               while ((dev = class_dev_iter_next(&iter))) {
-                       error = fn(dev, data);
-                       if (error)
-                               break;
-               }
-               class_dev_iter_exit(&iter);
+       class_dev_iter_init(&iter, class, start, NULL);
+       while ((dev = class_dev_iter_next(&iter))) {
+               error = fn(dev, data);
+               if (error)
+                       break;
        }
+       class_dev_iter_exit(&iter);
+
        return error;
 }
 EXPORT_SYMBOL_GPL(class_for_each_device);
@@ -440,9 +434,7 @@ struct device *class_find_device(struct class *class, struct device *start,
                return NULL;
        }
 
-       if (class_dev_iter_init(&iter, class, start, NULL) < 0)
-               return NULL;
-
+       class_dev_iter_init(&iter, class, start, NULL);
        while ((dev = class_dev_iter_next(&iter))) {
                if (match(dev, data)) {
                        get_device(dev);