summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYoichi Yuasa <yuasa@linux-mips.org>2010-05-24 10:36:24 +0200
committerRalf Baechle <ralf@linux-mips.org>2010-07-05 18:17:26 +0200
commitcdf22a4e90ea3ea8e6a7dd9d2fa810b4a3cdfaed (patch)
treeece77d50f0bcfb06dfd52c313a61918309c086f4
parentMIPS: Restore signalling NaN behaviour for abs.[sd] (diff)
downloadlinux-cdf22a4e90ea3ea8e6a7dd9d2fa810b4a3cdfaed.tar.xz
linux-cdf22a4e90ea3ea8e6a7dd9d2fa810b4a3cdfaed.zip
MIPS: AR7, BCM63xx: fix gpio_to_irq() return value
The return value of gpio_to_irq() is not a pointer but an integer. Signed-off-by: Yoichi Yuasa <yuasa@linux-mips.org> Cc: linux-mips <linux-mips@linux-mips.org> Patchwork: http://patchwork.linux-mips.org/patch/1280/ Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
-rw-r--r--arch/mips/include/asm/mach-ar7/gpio.h2
-rw-r--r--arch/mips/include/asm/mach-bcm63xx/gpio.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/mips/include/asm/mach-ar7/gpio.h b/arch/mips/include/asm/mach-ar7/gpio.h
index 73f9b162c970..abc317c0372e 100644
--- a/arch/mips/include/asm/mach-ar7/gpio.h
+++ b/arch/mips/include/asm/mach-ar7/gpio.h
@@ -24,7 +24,7 @@
#define AR7_GPIO_MAX 32
#define NR_BUILTIN_GPIO AR7_GPIO_MAX
-#define gpio_to_irq(gpio) NULL
+#define gpio_to_irq(gpio) -1
#define gpio_get_value __gpio_get_value
#define gpio_set_value __gpio_set_value
diff --git a/arch/mips/include/asm/mach-bcm63xx/gpio.h b/arch/mips/include/asm/mach-bcm63xx/gpio.h
index 7cda8c0a3979..1eb534de8e3b 100644
--- a/arch/mips/include/asm/mach-bcm63xx/gpio.h
+++ b/arch/mips/include/asm/mach-bcm63xx/gpio.h
@@ -3,7 +3,7 @@
#include <bcm63xx_gpio.h>
-#define gpio_to_irq(gpio) NULL
+#define gpio_to_irq(gpio) -1
#define gpio_get_value __gpio_get_value
#define gpio_set_value __gpio_set_value