diff options
| author | Rob Herring <robh@kernel.org> | 2018-11-16 16:10:59 -0600 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2018-11-26 22:33:37 +1100 |
| commit | 5b8d6be7b8dd286bd654e37d637ded139eae5dd4 (patch) | |
| tree | 9238ccbe829f3c6ac3304ec374cee002328db0b5 /arch/powerpc/kernel/btext.c | |
| parent | 721c01ba8b46ddb5355bd6e6b3bbfdabfdf01e97 (diff) | |
| download | linux-5b8d6be7b8dd286bd654e37d637ded139eae5dd4.tar.gz linux-5b8d6be7b8dd286bd654e37d637ded139eae5dd4.tar.bz2 linux-5b8d6be7b8dd286bd654e37d637ded139eae5dd4.zip | |
powerpc: Rework btext_find_display to use of_stdout and device_type helpers
Remove directly accessing device_node.type pointer and use the
accessors instead. This will eventually allow removing the type
pointer.
In the process, the of_stdout pointer can be used instead of finding
the stdout node again.
Signed-off-by: Rob Herring <robh@kernel.org>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Diffstat (limited to 'arch/powerpc/kernel/btext.c')
| -rw-r--r-- | arch/powerpc/kernel/btext.c | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/arch/powerpc/kernel/btext.c b/arch/powerpc/kernel/btext.c index b4241ed1456e..6dfceaa820e4 100644 --- a/arch/powerpc/kernel/btext.c +++ b/arch/powerpc/kernel/btext.c @@ -232,20 +232,12 @@ static int btext_initialize(struct device_node *np) int __init btext_find_display(int allow_nonstdout) { - const char *name; - struct device_node *np = NULL; + struct device_node *np = of_stdout; int rc = -ENODEV; - name = of_get_property(of_chosen, "linux,stdout-path", NULL); - if (name != NULL) { - np = of_find_node_by_path(name); - if (np != NULL) { - if (strcmp(np->type, "display") != 0) { - printk("boot stdout isn't a display !\n"); - of_node_put(np); - np = NULL; - } - } + if (!of_node_is_type(np, "display")) { + printk("boot stdout isn't a display !\n"); + np = NULL; } if (np) rc = btext_initialize(np); |