From: Marek Vasut <[email protected]> The of_empty_ranges_quirk() returns a mix of boolean and signed integer types, which cannot work well. Replace that with boolean only and fix usage logic in of_translate_one() -- the check should trigger when the ranges are NULL and the quirk is applicable on the hardware.
Signed-off-by: Marek Vasut <[email protected]> Cc: Rob Herring <[email protected]> Cc: Frank Rowand <[email protected]> Cc: [email protected] To: [email protected] --- drivers/of/address.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/drivers/of/address.c b/drivers/of/address.c index b492176c0572..ae2819e148b8 100644 --- a/drivers/of/address.c +++ b/drivers/of/address.c @@ -616,7 +616,7 @@ static struct of_bus *of_match_bus(struct device_node *np) return NULL; } -static int of_empty_ranges_quirk(struct device_node *np) +static bool of_empty_ranges_quirk(struct device_node *np) { if (IS_ENABLED(CONFIG_PPC)) { /* To save cycles, we cache the result for global "Mac" setting */ @@ -631,7 +631,8 @@ static int of_empty_ranges_quirk(struct device_node *np) quirk_state = of_machine_is_compatible("Power Macintosh") || of_machine_is_compatible("MacRISC"); - return quirk_state; + if (quirk_state > 0) + return true; } return false; } @@ -662,8 +663,8 @@ static int of_translate_one(struct device_node *parent, struct of_bus *bus, * This code is only enabled on powerpc. --gcl */ ranges = of_get_property(parent, rprop, &rlen); - if (ranges == NULL && !of_empty_ranges_quirk(parent)) { - pr_debug("no ranges; cannot translate\n"); + if (ranges == NULL && of_empty_ranges_quirk(parent)) { + pr_err("no ranges; cannot translate\n"); return 1; } if (ranges == NULL || rlen == 0) { -- 2.20.1
