diff options
| author | Rob Herring <robh@kernel.org> | 2018-11-16 16:11:04 -0600 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2018-11-19 12:20:51 +0100 |
| commit | c12faa2bc56cb1e7a12b49f0b3a935c0c64fd0b4 (patch) | |
| tree | a8efac8ba8b39fb014a72b7a8be5d0a76bd7f77f /sound/aoa | |
| parent | 988e30af9a508a40d958a9eec5c47b1c6d36176f (diff) | |
| download | linux-stable-c12faa2bc56cb1e7a12b49f0b3a935c0c64fd0b4.tar.gz linux-stable-c12faa2bc56cb1e7a12b49f0b3a935c0c64fd0b4.tar.bz2 linux-stable-c12faa2bc56cb1e7a12b49f0b3a935c0c64fd0b4.zip | |
ALSA: aoa: Use device_type helpers to access the node type
Remove directly accessing device_node.type pointer and use the accessors
instead. This will eventually allow removing the type pointer.
Replace the open coded iterating over child nodes with
for_each_child_of_node() while we're here.
Cc: Johannes Berg <johannes@sipsolutions.net>
Cc: Jaroslav Kysela <perex@perex.cz>
Cc: Takashi Iwai <tiwai@suse.com>
Cc: linuxppc-dev@lists.ozlabs.org
Cc: alsa-devel@alsa-project.org
Signed-off-by: Rob Herring <robh@kernel.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/aoa')
| -rw-r--r-- | sound/aoa/fabrics/layout.c | 4 | ||||
| -rw-r--r-- | sound/aoa/soundbus/core.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/sound/aoa/fabrics/layout.c b/sound/aoa/fabrics/layout.c index 1eddf8fa188f..3a23fd032611 100644 --- a/sound/aoa/fabrics/layout.c +++ b/sound/aoa/fabrics/layout.c @@ -1008,8 +1008,8 @@ static int aoa_fabric_layout_probe(struct soundbus_dev *sdev) return -ENODEV; /* by breaking out we keep a reference */ - while ((sound = of_get_next_child(sdev->ofdev.dev.of_node, sound))) { - if (sound->type && strcasecmp(sound->type, "soundchip") == 0) + for_each_child_of_node(sdev->ofdev.dev.of_node, sound) { + if (of_node_is_type(sound, "soundchip")) break; } if (!sound) diff --git a/sound/aoa/soundbus/core.c b/sound/aoa/soundbus/core.c index 70bcaa7f93dd..f3076a3f7f2f 100644 --- a/sound/aoa/soundbus/core.c +++ b/sound/aoa/soundbus/core.c @@ -78,7 +78,7 @@ static int soundbus_uevent(struct device *dev, struct kobj_uevent_env *env) if (retval) return retval; - retval = add_uevent_var(env, "OF_TYPE=%s", of->dev.of_node->type); + retval = add_uevent_var(env, "OF_TYPE=%s", of_node_get_device_type(of->dev.of_node)); if (retval) return retval; |