p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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>
This commit is contained in:
Rob Herring 2018-11-16 16:10:59 -06:00 committed by Michael Ellerman
parent 721c01ba8b
commit 5b8d6be7b8
1 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
arch/powerpc/kernel/btext.c
View File

@ -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);