[PATCH] devicetree: Remove remaining references/tests for "chosen@0"
From: Robert P. J. Day <hidden>
Date: 2017-09-02 08:43:00
Also in:
linux-mips, linuxppc-dev
Subsystem:
linux for powerpc (32-bit and 64-bit), microblaze architecture, mips, mips generic platform, open firmware and flattened device tree, the rest · Maintainers:
Madhavan Srinivasan, Michal Simek, Thomas Bogendoerfer, Paul Burton, Rob Herring, Saravana Kannan, Linus Torvalds
Since, according to a recent devicetree ML posting by Rob Herring, the node "/chosen@0" is most likely for real Open Firmware and does not apply to DTSpec, remove all remaining tests and references for that node, of which there are very few left: arch/microblaze/kernel/prom.c | 3 +-- arch/mips/generic/yamon-dt.c | 4 ---- arch/powerpc/boot/oflib.c | 7 ++----- drivers/of/base.c | 2 -- drivers/of/fdt.c | 5 +---- 5 files changed, 4 insertions(+), 17 deletions(-) This should be innocuous as, in all of the three arch/ files above, there is a test for "chosen" immediately before the test for "chosen@0", so nothing should change. Signed-off-by: Robert P. J. Day <rpjday-L09J2beyid0N/H6P543EQg@public.gmane.org> --- if this patch is premature, then just ignore it, thanks.
diff --git a/arch/microblaze/kernel/prom.c b/arch/microblaze/kernel/prom.c
index 68f0999..c81bfd7 100644
--- a/arch/microblaze/kernel/prom.c
+++ b/arch/microblaze/kernel/prom.c@@ -53,8 +53,7 @@ static int __init early_init_dt_scan_chosen_serial(unsigned long node, pr_debug("%s: depth: %d, uname: %s\n", __func__, depth, uname); - if (depth == 1 && (strcmp(uname, "chosen") == 0 || - strcmp(uname, "chosen@0") == 0)) { + if (depth == 1 && (strcmp(uname, "chosen") == 0)) { p = of_get_flat_dt_prop(node, "linux,stdout-path", &l); if (p != NULL && l > 0) stdout = p; /* store pointer to stdout-path */
diff --git a/arch/mips/generic/yamon-dt.c b/arch/mips/generic/yamon-dt.c
index 6077bca..3a241b2 100644
--- a/arch/mips/generic/yamon-dt.c
+++ b/arch/mips/generic/yamon-dt.c@@ -28,8 +28,6 @@ __init int yamon_dt_append_cmdline(void *fdt) /* find or add chosen node */ chosen_off = fdt_path_offset(fdt, "/chosen"); if (chosen_off == -FDT_ERR_NOTFOUND) - chosen_off = fdt_path_offset(fdt, "/chosen@0"); - if (chosen_off == -FDT_ERR_NOTFOUND) chosen_off = fdt_add_subnode(fdt, 0, "chosen"); if (chosen_off < 0) { pr_err("Unable to find or add DT chosen node: %d\n",
@@ -221,8 +219,6 @@ __init int yamon_dt_serial_config(void *fdt) /* find or add chosen node */ chosen_off = fdt_path_offset(fdt, "/chosen"); if (chosen_off == -FDT_ERR_NOTFOUND) - chosen_off = fdt_path_offset(fdt, "/chosen@0"); - if (chosen_off == -FDT_ERR_NOTFOUND) chosen_off = fdt_add_subnode(fdt, 0, "chosen"); if (chosen_off < 0) { pr_err("Unable to find or add DT chosen node: %d\n",
diff --git a/arch/powerpc/boot/oflib.c b/arch/powerpc/boot/oflib.c
index 46c98a4..a01471f 100644
--- a/arch/powerpc/boot/oflib.c
+++ b/arch/powerpc/boot/oflib.c@@ -131,11 +131,8 @@ static int check_of_version(void) return 0; chosen = of_finddevice("/chosen"); if (chosen == (phandle) -1) { - chosen = of_finddevice("/chosen@0"); - if (chosen == (phandle) -1) { - printf("no chosen\n"); - return 0; - } + printf("no chosen\n"); + return 0; } if (of_getprop(chosen, "mmu", &chosen_mmu, sizeof(chosen_mmu)) <= 0) { printf("no mmu\n");
diff --git a/drivers/of/base.c b/drivers/of/base.c
index 686628d..e0f636d 100644
--- a/drivers/of/base.c
+++ b/drivers/of/base.c@@ -1659,8 +1659,6 @@ void of_alias_scan(void * (*dt_alloc)(u64 size, u64 align)) of_aliases = of_find_node_by_path("/aliases"); of_chosen = of_find_node_by_path("/chosen"); - if (of_chosen == NULL) - of_chosen = of_find_node_by_path("/chosen@0"); if (of_chosen) { /* linux,stdout-path and /aliases/stdout are for legacy compatibility */
diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c
index ce30c9a..0b0a709 100644
--- a/drivers/of/fdt.c
+++ b/drivers/of/fdt.c@@ -980,8 +980,6 @@ int __init early_init_dt_scan_chosen_stdout(void) offset = fdt_path_offset(fdt, "/chosen"); if (offset < 0) - offset = fdt_path_offset(fdt, "/chosen@0"); - if (offset < 0) return -ENOENT; p = fdt_getprop(fdt, offset, "stdout-path", &l);
@@ -1117,8 +1115,7 @@ int __init early_init_dt_scan_chosen(unsigned long node, const char *uname, pr_debug("search \"chosen\", depth: %d, uname: %s\n", depth, uname); - if (depth != 1 || !data || - (strcmp(uname, "chosen") != 0 && strcmp(uname, "chosen@0") != 0)) + if (depth != 1 || !data || (strcmp(uname, "chosen") != 0)) return 0; early_init_dt_check_for_initrd(node);
--
========================================================================
Robert P. J. Day Ottawa, Ontario, CANADA
http://crashcourse.ca
Twitter: http://twitter.com/rpjday
LinkedIn: http://ca.linkedin.com/in/rpjday
========================================================================
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html