aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2019-01-20 10:28:46 +1200
committerLinus Torvalds <torvalds@linux-foundation.org>2019-01-20 10:28:46 +1200
commit6a0141a0966cfbd765bff065c3eb61b09a92318e (patch)
tree87e4897f42b8cd532b9bfa2fa89050997844142f
parent26caabbcd7a5d10577fd59eded2ec1c44466659e (diff)
parent75a080cde08d2dcba19ee864f9732094d93fab41 (diff)
download96b-common-6a0141a0966cfbd765bff065c3eb61b09a92318e.tar.gz
Merge tag 'devicetree-fixes-for-5.0-2' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux
Pull Devicetree fix from Rob Herring: "A single build fix for powerpc due to device_node.type removal" * tag 'devicetree-fixes-for-5.0-2' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux: powerpc: chrp: Use of_node_is_type to access device_type
-rw-r--r--arch/powerpc/platforms/chrp/setup.c3
1 files changed, 1 insertions, 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)