[PATCH] Change ep93xx gpio_irq static inlines to macros

[H Hartley Sweeten]

From: Ryan Mallon <ryan at bluewatersys.com>

Change the gpio_to_irq and irq_to_gpio static inline functions to macros
so that they can be used in variable initialisers.

Signed-off-by: Ryan Mallon <ryan at bluewatersys.com>
Acked-by: H Hartley Sweeten <hsweeten at visionengravers.com>

---

This patch seems to have been lost, originally posted 4/19/2009.
Updated so that the macro parameters are wrapped with ().


diff --git a/arch/arm/mach-ep93xx/include/mach/gpio.h b/arch/arm/mach-ep93xx/include/mach/gpio.h
index 0a1498a..c991b14 100644
--- a/arch/arm/mach-ep93xx/include/mach/gpio.h
+++ b/arch/arm/mach-ep93xx/include/mach/gpio.h
@@ -114,17 +114,9 @@ extern void ep93xx_gpio_int_debounce(unsigned int irq, int enable);
  *          B0..B7  (7..15) to irq 72..79, and
  *          F0..F7 (16..24) to irq 80..87.
  */
-static inline int gpio_to_irq(unsigned gpio)
-{
-	if (gpio <= EP93XX_GPIO_LINE_MAX_IRQ)
-		return 64 + gpio;
-
-	return -EINVAL;
-}
-
-static inline int irq_to_gpio(unsigned irq)
-{
-	return irq - gpio_to_irq(0);
-}
+#define gpio_to_irq(gpio)	\
+	(((gpio) <= EP93XX_GPIO_LINE_MAX_IRQ) ? (64 + (gpio)) : -EINVAL)
+
+#define irq_to_gpio(irq)	((irq) - gpio_to_irq(0))
 
 #endif