of: address: Fix parser address/size cells initialization

bus->count_cells() parses cells starting from the node's parent. This is
not good enough for parser_init() which is generally parsing a bus node.

Revert to previous behavior using of_bus_n_*_cells().

Fixes: 2f96593ecc37 ("of_address: Add bus type match for pci ranges parser")
Reported-by: Nathan Chancellor <natechancellor@gmail.com>
Signed-off-by: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
Acked-by: Rob Herring <robh@kernel.org>
Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>

diff --git a/drivers/of/address.c b/drivers/of/address.c
index 157dc7e06077ebffb395a4ac6172f86a48e7dd40..df471d171a298dc4a35ca6b51314d2b4dc6b910b 100644 (file)
--- a/drivers/of/address.c
+++ b/drivers/of/address.c
@@ -701,11 +701,11 @@ static int parser_init(struct of_pci_range_parser *parser,
 
        parser->node = node;
        parser->pna = of_n_addr_cells(node);
+       parser->na = of_bus_n_addr_cells(node);
+       parser->ns = of_bus_n_size_cells(node);
        parser->dma = !strcmp(name, "dma-ranges");
        parser->bus = of_match_bus(node);
 
-       parser->bus->count_cells(parser->node, &parser->na, &parser->ns);
-
        parser->range = of_get_property(node, name, &rlen);
        if (parser->range == NULL)
                return -ENOENT;