1 files changed, 10 insertions, 4 deletions

diff --git a/drivers/base/class.c b/drivers/base/class.c
index 54def4e02f00..d8a6a5864c2e 100644
--- a/drivers/base/class.c
+++ b/drivers/base/class.c
@@ -117,16 +117,22 @@ static void class_put(struct class *cls)
                 kset_put(&cls->p->subsys);
 }
 
+static struct device *klist_class_to_dev(struct klist_node *n)
+{
+        struct device_private *p = to_device_private_class(n);
+        return p->device;
+}
+
 static void klist_class_dev_get(struct klist_node *n)
 {
-        struct device *dev = container_of(n, struct device, knode_class);
+        struct device *dev = klist_class_to_dev(n);
 
         get_device(dev);
 }
 
 static void klist_class_dev_put(struct klist_node *n)
 {
-        struct device *dev = container_of(n, struct device, knode_class);
+        struct device *dev = klist_class_to_dev(n);
 
         put_device(dev);
 }
@@ -277,7 +283,7 @@ void class_dev_iter_init(struct class_dev_iter *iter, struct class *class,
         struct klist_node *start_knode = NULL;
 
         if (start)
-                start_knode = &start->knode_class;
+                start_knode = &start->p->knode_class;
         klist_iter_init_node(&class->p->klist_devices, &iter->ki, start_knode);
         iter->type = type;
 }
@@ -304,7 +310,7 @@ struct device *class_dev_iter_next(struct class_dev_iter *iter)
                 knode = klist_next(&iter->ki);
                 if (!knode)
                         return NULL;
-                dev = container_of(knode, struct device, knode_class);
+                dev = klist_class_to_dev(knode);
                 if (!iter->type || iter->type == dev->type)
                         return dev;
         }