MIPS: ralink: Fix request_mem_region error handling

request_mem_region returns a NULL pointer on error, comparing it
against a number results in a warning:

arch/mips/ralink/of.c: In function 'plat_of_remap_node':
arch/mips/ralink/of.c:45:15: error: ordered comparison of pointer with integer zero [-Werror=extra]
arch/mips/ralink/irq.c: In function 'intc_of_init':
arch/mips/ralink/irq.c:167:15: error: ordered comparison of pointer with integer zero [-Werror=extra]

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: John Crispin <john@phrozen.org>
Cc: Tobias Wolf <dev-NTEO@vplace.de>
Cc: linux-mips@linux-mips.org
Cc: linux-kernel@vger.kernel.org
Patchwork: https://patchwork.linux-mips.org/patch/15045/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

diff --git a/arch/mips/ralink/irq.c b/arch/mips/ralink/irq.c
index 4911c1445f1a44549ebfef7beb41a2006c085a85..9b478c95aaf5aab40a0417963eeb2897792f79b9 100644 (file)
--- a/arch/mips/ralink/irq.c
+++ b/arch/mips/ralink/irq.c
@@ -163,8 +163,8 @@ static int __init intc_of_init(struct device_node *node,
        if (of_address_to_resource(node, 0, &res))
                panic("Failed to get intc memory range");
 
-       if (request_mem_region(res.start, resource_size(&res),
-                               res.name) < 0)
+       if (!request_mem_region(res.start, resource_size(&res),
+                               res.name))
                pr_err("Failed to request intc memory");
 
        rt_intc_membase = ioremap_nocache(res.start,

diff --git a/arch/mips/ralink/of.c b/arch/mips/ralink/of.c
index 4c843e039b96fa6e5ee7dce6e1e73766001ae783..1ada8492733b6018766d8a5c1e68cc633133b818 100644 (file)
--- a/arch/mips/ralink/of.c
+++ b/arch/mips/ralink/of.c
@@ -40,9 +40,9 @@ __iomem void *plat_of_remap_node(const char *node)
        if (of_address_to_resource(np, 0, &res))
                panic("Failed to get resource for %s", node);
 
-       if ((request_mem_region(res.start,
+       if (!request_mem_region(res.start,
                                resource_size(&res),
-                               res.name) < 0))
+                               res.name))
                panic("Failed to request resources for %s", node);
 
        return ioremap_nocache(res.start, resource_size(&res));