Skip to contentSkip to conversation

ALSA: aoa: Use device_type helpers to access the node type

PATCH Applied Rob Herring 2 participants 2 messages Nov 16, 2018 – Nov 19, 2018

Subsystems (2)
Sound Aoa (Apple Onboard Audio) ALSA driver

v1 of 2 Applied Latest is v2 →

lore
Share & tools
lore

Rob Herring

author
#0 lore raw

PATCH 1/1 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 <[email protected]>
Cc Jaroslav Kysela <[email protected]>
Cc Takashi Iwai <[email protected]>
Cc [email protected]
Cc [email protected]
Signed-off-by Rob Herring <[email protected]>
---
 sound/aoa/fabrics/layout.c | 4 ++--
 sound/aoa/soundbus/core.c  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
sound/aoa/fabrics/layout.c +2 -2
index 1eddf8fa188f..3a23fd032611 100644
@@ -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)
sound/aoa/soundbus/core.c +1 -1
index 70bcaa7f93dd..f3076a3f7f2f 100644
@@ -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;
Signature · 1 line
2.19.1
Applied
#1 lore raw
Quoted 7 lines · Rob Herring

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.

Quoted 6 lines
Cc Johannes Berg <[email protected]>
Cc Jaroslav Kysela <[email protected]>
Cc Takashi Iwai <[email protected]>
Cc [email protected]
Cc [email protected]
Signed-off-by Rob Herring <[email protected]>

Applied, thanks.

Takashi