powerpc: Rework btext_find_display to use of_stdout and device_type helpers (5b8d6be7) · Commits · 戴 / test

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>

arch/powerpc/kernel/btext.c

+4 −12

Original line number	Diff line number	Diff line
		@@ -232,21 +232,13 @@ 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) {
		if (!of_node_is_type(np, "display")) {
		printk("boot stdout isn't a display !\n");
		of_node_put(np);
		np = NULL;
		}
		}
		}
		if (np)
		rc = btext_initialize(np);
		if (rc == 0 \|\| !allow_nonstdout)

Admin message