[PATCH 1/2] 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 <redacted>
---
 arch/arm/mach-at91/include/mach/gpio.h |   11 ++---------
 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 bfdd8ab..ddeb645 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__ */
 

-- 
1.7.0.4

Signed-off-by: Ryan Mallon <redacted>
---
 arch/arm/mach-at91/board-snapper9260.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/arch/arm/mach-at91/board-snapper9260.c b/arch/arm/mach-at91/board-snapper9260.c
index 0a99b3c..17f7d9b 100644
--- a/arch/arm/mach-at91/board-snapper9260.c
+++ b/arch/arm/mach-at91/board-snapper9260.c

@@ -153,6 +153,7 @@ static struct i2c_board_info __initdata snapper9260_i2c_devices[] = {
 	{
 		/* RTC */
 		I2C_BOARD_INFO("isl1208", 0x6f),
+		.irq = gpio_to_irq(AT91_PIN_PA31),
 	},
 };
 

-- 
1.7.0.4

On 16:44 Fri 11 Feb     , Ryan Mallon wrote:

Signed-off-by: Ryan Mallon <redacted>
---

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <redacted>

Best Regards,
J.

On 16:44 Fri 11 Feb     , Ryan Mallon wrote:

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 <redacted>
---

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <redacted>

Best Regards,
J.