Skip to contentSkip to conversation

powerpc: chrp: Use of_node_is_type to access device_type

PATCH In review Rob Herring 2 participants 2 messages Jan 18, 2019 – Jan 19, 2019 PowerPC

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 powerpc: chrp: Use of_node_is_type to access device_type

Commit 8ce5f8415753 ("of: Remove struct device_node.type pointer") removed struct device_node.type pointer, but the conversion to use of_node_is_type() accessor was missed in chrp_init_IRQ().

Fixes 8ce5f8415753 ("of: Remove struct device_node.type pointer")
Cc Benjamin Herrenschmidt <[email protected]>
Cc Paul Mackerras <[email protected]>
Cc Michael Ellerman <[email protected]>

---
Michael, I see you just sent a PR of fixes. I can send this to Linus if you prefer.

 arch/powerpc/platforms/chrp/setup.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
arch/powerpc/platforms/chrp/setup.c +1 -2
index e66644e0fb40..9438fa0fc355 100644
@@ -538,8 +538,7 @@ static void __init chrp_init_IRQ(void)
 	/* see if there is a keyboard in the device tree
 	   with a parent of type "adb" */
 	for_each_node_by_name(kbd, "keyboard")
-		if (kbd->parent && kbd->parent->type
-		    && strcmp(kbd->parent->type, "adb") == 0)
+		if (of_node_is_type(kbd->parent, "adb"))
 			break;
 	of_node_put(kbd);
 	if (kbd)
Signature · 1 line
2.19.1
reviewer Acked-by on v1 1/1
#1 lore raw
Quoted 11 lines · Rob Herring

Commit 8ce5f8415753 ("of: Remove struct device_node.type pointer") removed struct device_node.type pointer, but the conversion to use of_node_is_type() accessor was missed in chrp_init_IRQ().

Fixes 8ce5f8415753 ("of: Remove struct device_node.type pointer")
Cc Benjamin Herrenschmidt <[email protected]>
Cc Paul Mackerras <[email protected]>
Cc Michael Ellerman <[email protected]>
Quoted 3 lines

---
Michael, I see you just sent a PR of fixes. I can send this to Linus if you prefer.

Yeah if you're happy to, thanks.

cheers