summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRyan Mallon <ryan@bluewatersys.com>2011-02-14 03:44:22 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2011-02-19 11:54:01 +0100
commitad56c0dd9dfb0175e605b5e66b3f9973bef60ca0 (patch)
tree8f59ab2e10d3c7ba2faadcd146b82dc4e8594dd1
parentLinux 2.6.38-rc5 (diff)
downloadlinux-ad56c0dd9dfb0175e605b5e66b3f9973bef60ca0.tar.xz
linux-ad56c0dd9dfb0175e605b5e66b3f9973bef60ca0.zip
ARM: 6664/1: AT91: Use macros for gpio_to_irq/irq_to_gpio
Replace the static inline functions for gpio_to_irq/irq_to_gpio so that they can be used in static initialisers. Signed-off-by: Ryan Mallon <ryan@bluewatersys.com> Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
-rw-r--r--arch/arm/mach-at91/include/mach/gpio.h11
1 files changed, 2 insertions, 9 deletions
diff --git a/arch/arm/mach-at91/include/mach/gpio.h b/arch/arm/mach-at91/include/mach/gpio.h
index bfdd8ab26dc8..ddeb64536756 100644
--- a/arch/arm/mach-at91/include/mach/gpio.h
+++ b/arch/arm/mach-at91/include/mach/gpio.h
@@ -220,15 +220,8 @@ extern void at91_gpio_resume(void);
#define gpio_set_value __gpio_set_value
#define gpio_cansleep __gpio_cansleep
-static inline int gpio_to_irq(unsigned gpio)
-{
- return gpio;
-}
-
-static inline int irq_to_gpio(unsigned irq)
-{
- return irq;
-}
+#define gpio_to_irq(gpio) (gpio)
+#define irq_to_gpio(irq) (irq)
#endif /* __ASSEMBLY__ */