| Message ID | 1547914725-12125-1-git-send-email-linux@roeck-us.net (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [v2] powerpc: chrp: Use device_type helpers to access the node type | expand |
| Context | Check | Description |
|---|---|---|
| snowpatch_ozlabs/apply_patch | success | next/apply_patch Successfully applied |
| snowpatch_ozlabs/build-ppc64le | success | build succeeded & removed 0 sparse warning(s) |
| snowpatch_ozlabs/build-ppc64be | success | build succeeded & removed 0 sparse warning(s) |
| snowpatch_ozlabs/build-ppc64e | success | build succeeded & removed 0 sparse warning(s) |
| snowpatch_ozlabs/build-pmac32 | success | build succeeded & removed 0 sparse warning(s) |
| snowpatch_ozlabs/checkpatch | success | total: 0 errors, 0 warnings, 0 checks, 9 lines checked |
On Sat, Jan 19, 2019 at 10:18 AM Guenter Roeck <linux@roeck-us.net> wrote: > > 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@kernel.org> > Signed-off-by: Guenter Roeck <linux@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(-) Already have the same patch acked by Michael and am sending to Linus shortly. Rob
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)
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@kernel.org> Signed-off-by: Guenter Roeck <linux@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(-)