[PATCH 16/16] ARM: w90x900: Switch over to gpiolib ->to_irq() and __gpio_to_irq().

[Lennert Buytenhek]

Signed-off-by: Lennert Buytenhek <buytenh at secretlab.ca>
---
 arch/arm/mach-w90x900/gpio.c              |    6 ++++++
 arch/arm/mach-w90x900/include/mach/gpio.h |    6 +-----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/arch/arm/mach-w90x900/gpio.c b/arch/arm/mach-w90x900/gpio.c
index ba05aec..dbf1825 100644
--- a/arch/arm/mach-w90x900/gpio.c
+++ b/arch/arm/mach-w90x900/gpio.c
@@ -40,6 +40,7 @@
 			.direction_output = nuc900_dir_output,		\
 			.get		  = nuc900_gpio_get,		\
 			.set		  = nuc900_gpio_set,		\
+			.to_irq		  = nuc900_gpio_to_irq,		\
 			.base		  = base_gpio,			\
 			.ngpio		  = nr_gpio,			\
 		}							\
@@ -130,6 +131,11 @@ static int nuc900_dir_output(struct gpio_chip *chip, unsigned offset, int val)
 	return 0;
 }
 
+static int nuc900_gpio_to_irq(struct gpio_chip *chip, unsigned offset)
+{
+	return chip->base + offset;
+}
+
 static struct nuc900_gpio_chip nuc900_gpio[] = {
 	NUC900_GPIO_CHIP("GROUPC", 0, 16),
 	NUC900_GPIO_CHIP("GROUPD", 16, 10),
diff --git a/arch/arm/mach-w90x900/include/mach/gpio.h b/arch/arm/mach-w90x900/include/mach/gpio.h
index 034da3e..f9b9a37 100644
--- a/arch/arm/mach-w90x900/include/mach/gpio.h
+++ b/arch/arm/mach-w90x900/include/mach/gpio.h
@@ -20,11 +20,7 @@
 #define gpio_get_value	__gpio_get_value
 #define gpio_set_value	__gpio_set_value
 #define gpio_cansleep	__gpio_cansleep
-
-static inline int gpio_to_irq(unsigned gpio)
-{
-	return gpio;
-}
+#define gpio_to_irq	__gpio_to_irq
 
 static inline int irq_to_gpio(unsigned irq)
 {
-- 
1.7.1