1 files changed, 7 insertions, 6 deletions

diff --git a/drivers/macintosh/rack-meter.c b/drivers/macintosh/rack-meter.c
index 1f29d2413c74..3940e2a032f7 100644
--- a/drivers/macintosh/rack-meter.c
+++ b/drivers/macintosh/rack-meter.c
@@ -376,18 +376,19 @@ static int rackmeter_probe(struct macio_dev* mdev,
         pr_debug("rackmeter_probe()\n");
 
         /* Get i2s-a node */
-        while ((i2s = of_get_next_child(mdev->ofdev.dev.of_node, i2s)) != NULL)
-               if (strcmp(i2s->name, "i2s-a") == 0)
-                       break;
+        for_each_child_of_node(mdev->ofdev.dev.of_node, i2s)
+                if (of_node_name_eq(i2s, "i2s-a"))
+                        break;
+
         if (i2s == NULL) {
                 pr_debug("  i2s-a child not found\n");
                 goto bail;
         }
         /* Get lightshow or virtual sound */
-        while ((np = of_get_next_child(i2s, np)) != NULL) {
-               if (strcmp(np->name, "lightshow") == 0)
+        for_each_child_of_node(i2s, np) {
+               if (of_node_name_eq(np, "lightshow"))
                        break;
-               if ((strcmp(np->name, "sound") == 0) &&
+               if (of_node_name_eq(np, "sound") &&
                    of_get_property(np, "virtual", NULL) != NULL)
                        break;
         }