[PATCH v2] powerpc: chrp: Use device_type helpers to access the node type
Guenter Roeck
linux at roeck-us.net
Sun Jan 20 03:18:45 AEDT 2019
The node type can no longer be accessed directly, resulting in the
following build error. Use accessor function instead.
arch/powerpc/platforms/chrp/setup.c: In function ‘chrp_init_IRQ’:
arch/powerpc/platforms/chrp/setup.c:541:33: error:
‘struct device_node’ has no member named ‘type’
Fixes: 8ce5f8415753 ("of: Remove struct device_node.type pointer")
Cc: Rob Herring <robh at kernel.org>
Signed-off-by: Guenter Roeck <linux at roeck-us.net>
---
v2: of_node_is_type() checks if the node pointer is NULL, so there is
no need to check it before calling the function.
arch/powerpc/platforms/chrp/setup.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/arch/powerpc/platforms/chrp/setup.c b/arch/powerpc/platforms/chrp/setup.c
index e66644e0fb40..9438fa0fc355 100644
--- a/arch/powerpc/platforms/chrp/setup.c
+++ b/arch/powerpc/platforms/chrp/setup.c
@@ -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)
--
2.7.4
More information about the Linuxppc-dev
mailing list