diff options
| author | Takashi Iwai <tiwai@suse.de> | 2022-10-03 08:48:26 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2022-10-03 08:48:26 +0200 |
| commit | 02f2e785c4834828876a4701926416157dfd7b26 (patch) | |
| tree | 012f28cfcb57a15fb722c2c21bce3b0872172869 /sound/ppc/tumbler.c | |
| parent | 84ab9408118cac99ab83f1f7f6066d75dd3f24b6 (diff) | |
| parent | 56e696c0f0c71b77fff921fc94b58a02f0445b2c (diff) | |
Merge branch 'for-next' into for-linus
Diffstat (limited to 'sound/ppc/tumbler.c')
| -rw-r--r-- | sound/ppc/tumbler.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/sound/ppc/tumbler.c b/sound/ppc/tumbler.c index c65e74d7cd0a..f3f8ad7c3df8 100644 --- a/sound/ppc/tumbler.c +++ b/sound/ppc/tumbler.c @@ -1060,8 +1060,7 @@ static struct device_node *find_audio_device(const char *name) if (! gpiop) return NULL; - for (np = of_get_next_child(gpiop, NULL); np; - np = of_get_next_child(gpiop, np)) { + for_each_child_of_node(gpiop, np) { const char *property = of_get_property(np, "audio-gpio", NULL); if (property && strcmp(property, name) == 0) break; @@ -1080,8 +1079,7 @@ static struct device_node *find_compatible_audio_device(const char *name) if (!gpiop) return NULL; - for (np = of_get_next_child(gpiop, NULL); np; - np = of_get_next_child(gpiop, np)) { + for_each_child_of_node(gpiop, np) { if (of_device_is_compatible(np, name)) break; } |