[PATCH] of/flattree: use OF_ROOT_NODE_{SIZE, ADDR}_CELLS DEFAULT for fdt parsing

Jeremy Kerr jeremy.kerr at canonical.com
Mon Dec 14 14:30:36 EST 2009


At present we're using hard-coded values for defaults when parsing the
FDT. This change uses the #defines instead.

Signed-off-by: Jeremy Kerr <jeremy.kerr at canonical.com>

---
 drivers/of/fdt.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c
index 4071639..4d089a1 100644
--- a/drivers/of/fdt.c
+++ b/drivers/of/fdt.c
@@ -439,11 +439,11 @@ int __init early_init_dt_scan_root(unsigned long node, const char *uname,
 		return 0;
 
 	prop = of_get_flat_dt_prop(node, "#size-cells", NULL);
-	dt_root_size_cells = (prop == NULL) ? 1 : *prop;
+	dt_root_size_cells = prop ? *prop : OF_ROOT_NODE_SIZE_CELLS_DEFAULT;
 	pr_debug("dt_root_size_cells = %x\n", dt_root_size_cells);
 
 	prop = of_get_flat_dt_prop(node, "#address-cells", NULL);
-	dt_root_addr_cells = (prop == NULL) ? 2 : *prop;
+	dt_root_addr_cells = prop ? *prop : OF_ROOT_NODE_ADDR_CELLS_DEFAULT;
 	pr_debug("dt_root_addr_cells = %x\n", dt_root_addr_cells);
 
 	/* break now */


More information about the devicetree-discuss mailing list