summaryrefslogtreecommitdiff
path: root/drivers/of
diff options
context:
space:
mode:
authorJeremy Kerr <jeremy.kerr@canonical.com>2010-02-02 07:34:14 +0300
committerGrant Likely <grant.likely@secretlab.ca>2010-02-09 18:34:10 +0300
commit36b9d3070d653af5807cef74ff129721d9047107 (patch)
tree92bdd46742a4a49d37a517b8061391a6a6f6ed42 /drivers/of
parent1406bc2f57787797d1f6a3675c019a7093769275 (diff)
downloadlinux-36b9d3070d653af5807cef74ff129721d9047107.tar.xz
of/flattree: use OF_ROOT_NODE_{SIZE,ADDR}_CELLS DEFAULT for fdt parsing
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@canonical.com> Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Diffstat (limited to 'drivers/of')
-rw-r--r--drivers/of/fdt.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c
index 9290ca5aa892..56fbd6e3122a 100644
--- a/drivers/of/fdt.c
+++ b/drivers/of/fdt.c
@@ -420,11 +420,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 */