Commit 36b9d3070d653af5807cef74ff129721d9047107
Committed by
Grant Likely
1 parent
1406bc2f57
Exists in
master
and in
4 other branches
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>
Showing 1 changed file with 2 additions and 2 deletions Side-by-side Diff
drivers/of/fdt.c
... | ... | @@ -420,11 +420,11 @@ |
420 | 420 | return 0; |
421 | 421 | |
422 | 422 | prop = of_get_flat_dt_prop(node, "#size-cells", NULL); |
423 | - dt_root_size_cells = (prop == NULL) ? 1 : *prop; | |
423 | + dt_root_size_cells = prop ? *prop : OF_ROOT_NODE_SIZE_CELLS_DEFAULT; | |
424 | 424 | pr_debug("dt_root_size_cells = %x\n", dt_root_size_cells); |
425 | 425 | |
426 | 426 | prop = of_get_flat_dt_prop(node, "#address-cells", NULL); |
427 | - dt_root_addr_cells = (prop == NULL) ? 2 : *prop; | |
427 | + dt_root_addr_cells = prop ? *prop : OF_ROOT_NODE_ADDR_CELLS_DEFAULT; | |
428 | 428 | pr_debug("dt_root_addr_cells = %x\n", dt_root_addr_cells); |
429 | 429 | |
430 | 430 | /* break now */ |