summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRob Herring <robh@kernel.org>2019-01-18 08:12:10 -0600
committerRob Herring <robh@kernel.org>2019-01-19 10:35:42 -0600
commit75a080cde08d2dcba19ee864f9732094d93fab41 (patch)
tree42f77adc19c9be38a5754e865bbc03e2b2ed9e1a
parent3705add0b783e0deeb6646ba0311bf214fe52b0a (diff)
downloadlwn-75a080cde08d2dcba19ee864f9732094d93fab41.tar.gz
lwn-75a080cde08d2dcba19ee864f9732094d93fab41.zip
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") Reported-by: kbuild test robot <lkp@intel.com> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> Cc: Paul Mackerras <paulus@samba.org> Cc: linuxppc-dev@lists.ozlabs.org Acked-by: Michael Ellerman <mpe@ellerman.id.au> Signed-off-by: Rob Herring <robh@kernel.org>
-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)