diff options
| author | Tom Rini <trini@konsulko.com> | 2016-01-08 10:02:25 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-01-08 10:02:25 -0500 |
| commit | 8c20dc40741a7eb03087ab47e988a899fd7175b1 (patch) | |
| tree | 325eba236bc636aa08588a3d5348cac5ef417aaa /common/fdt_support.c | |
| parent | 67ecb84ccbfd609170978833fd09b0b87fc4b630 (diff) | |
| parent | c5a75339cf1595ee89a3513cd4fd84c10c0cd910 (diff) | |
Merge git://git.denx.de/u-boot-dm
Diffstat (limited to 'common/fdt_support.c')
| -rw-r--r-- | common/fdt_support.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/common/fdt_support.c b/common/fdt_support.c index 66464dbfd8b..a539389a9e8 100644 --- a/common/fdt_support.c +++ b/common/fdt_support.c @@ -952,8 +952,7 @@ void fdt_del_node_and_alias(void *blob, const char *alias) /* Max address size we deal with */ #define OF_MAX_ADDR_CELLS 4 #define OF_BAD_ADDR FDT_ADDR_T_NONE -#define OF_CHECK_COUNTS(na, ns) ((na) > 0 && (na) <= OF_MAX_ADDR_CELLS && \ - (ns) > 0) +#define OF_CHECK_COUNTS(na) ((na) > 0 && (na) <= OF_MAX_ADDR_CELLS) /* Debug utility */ #ifdef DEBUG @@ -1121,7 +1120,7 @@ static u64 __of_translate_address(void *blob, int node_offset, const fdt32_t *in /* Cound address cells & copy address locally */ bus->count_cells(blob, parent, &na, &ns); - if (!OF_CHECK_COUNTS(na, ns)) { + if (!OF_CHECK_COUNTS(na)) { printf("%s: Bad cell count for %s\n", __FUNCTION__, fdt_get_name(blob, node_offset, NULL)); goto bail; @@ -1148,7 +1147,7 @@ static u64 __of_translate_address(void *blob, int node_offset, const fdt32_t *in /* Get new parent bus and counts */ pbus = &of_busses[0]; pbus->count_cells(blob, parent, &pna, &pns); - if (!OF_CHECK_COUNTS(pna, pns)) { + if (!OF_CHECK_COUNTS(pna)) { printf("%s: Bad cell count for %s\n", __FUNCTION__, fdt_get_name(blob, node_offset, NULL)); break; |