ALSA: aoa: Use of_node_name_eq for node name comparisons

Convert string compares of DT node names to use of_node_name_eq helper
instead. This removes direct access to the node name pointer.

A couple of open coded iterating thru the child node names are converted
to use for_each_child_of_node() instead.

Signed-off-by: Rob Herring <robh@kernel.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>

diff --git a/sound/aoa/fabrics/layout.c b/sound/aoa/fabrics/layout.c
index 3a23fd032611139e0145a5bc5d316806d6cc0772..8797d42e2b76285f7da87a8000517fb943cd5e61 100644 (file)
--- a/sound/aoa/fabrics/layout.c
+++ b/sound/aoa/fabrics/layout.c
@@ -776,7 +776,7 @@ static int check_codec(struct aoa_codec *codec,
        struct codec_connection *cc;
 
        /* if the codec has a 'codec' node, we require a reference */
-       if (codec->node && (strcmp(codec->node->name, "codec") == 0)) {
+       if (of_node_name_eq(codec->node, "codec")) {
                snprintf(propname, sizeof(propname),
                         "platform-%s-codec-ref", codec->name);
                ref = of_get_property(ldev->sound, propname, NULL);

diff --git a/sound/aoa/soundbus/i2sbus/core.c b/sound/aoa/soundbus/i2sbus/core.c
index bd7c5029fc59300ec3432d94543aa2b027f28fa8..c3f57a3fb1a533218144cd76930e1161e1f529bf 100644 (file)
--- a/sound/aoa/soundbus/i2sbus/core.c
+++ b/sound/aoa/soundbus/i2sbus/core.c
@@ -154,7 +154,7 @@ static int i2sbus_add_dev(struct macio_dev *macio,
                          struct device_node *np)
 {
        struct i2sbus_dev *dev;
-       struct device_node *child = NULL, *sound = NULL;
+       struct device_node *child, *sound = NULL;
        struct resource *r;
        int i, layout = 0, rlen, ok = force;
        char node_name[6];
@@ -177,8 +177,8 @@ static int i2sbus_add_dev(struct macio_dev *macio,
                return 0;
 
        i = 0;
-       while ((child = of_get_next_child(np, child))) {
-               if (strcmp(child->name, "sound") == 0) {
+       for_each_child_of_node(np, child) {
+               if (of_node_name_eq(child, "sound")) {
                        i++;
                        sound = child;
                }

diff --git a/sound/ppc/pmac.c b/sound/ppc/pmac.c
index 48dd44f8e914c3270b80da68de91d71db13086d1..d692e4070167bff00d714cd93c8a8a9d366cd692 100644 (file)
--- a/sound/ppc/pmac.c
+++ b/sound/ppc/pmac.c
@@ -908,7 +908,7 @@ static void detect_byte_swap(struct snd_pmac *chip)
 
        /* if seems that Keylargo can't byte-swap  */
        for (mio = chip->node->parent; mio; mio = mio->parent) {
-               if (strcmp(mio->name, "mac-io") == 0) {
+               if (of_node_name_eq(mio, "mac-io")) {
                        if (of_device_is_compatible(mio, "Keylargo"))
                                chip->can_byte_swap = 0;
                        break;
@@ -1313,7 +1313,7 @@ int snd_pmac_new(struct snd_card *card, struct snd_pmac **chip_return)
        } else if (chip->is_pbook_G3) {
                struct device_node* mio;
                for (mio = chip->node->parent; mio; mio = mio->parent) {
-                       if (strcmp(mio->name, "mac-io") == 0) {
+                       if (of_node_name_eq(mio, "mac-io")) {
                                struct resource r;
                                if (of_address_to_resource(mio, 0, &r) == 0)
                                        chip->macio_base =

diff --git a/sound/ppc/tumbler.c b/sound/ppc/tumbler.c
index 0779a29122379b6368a8e62a7602b857fb32f8ff..6d7ffffcce95b6a7b97e1ca046eefb2f30309841 100644 (file)
--- a/sound/ppc/tumbler.c
+++ b/sound/ppc/tumbler.c
@@ -1365,8 +1365,8 @@ int snd_pmac_tumbler_init(struct snd_pmac *chip)
        mix->anded_reset = 0;
        mix->reset_on_sleep = 1;
 
-       for (np = chip->node->child; np; np = np->sibling) {
-               if (!strcmp(np->name, "sound")) {
+       for_each_child_of_node(chip->node, np) {
+               if (of_node_name_eq(np, "sound")) {
                        if (of_get_property(np, "has-anded-reset", NULL))
                                mix->anded_reset = 1;
                        if (of_get_property(np, "layout-id", NULL))