From: Shawn Guo <shawn.guo@linaro.org>
Date: Sat, 13 Aug 2011 16:14:04 +0000 (+0800)
Subject: gpio/mxc: move irq_to_gpio() into gpio-mxc driver
X-Git-Tag: v3.2-rc1~98^2~14^3~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a4395612290c7b70041952add7ad75b534c8b40c;p=thirdparty%2Fkernel%2Flinux.git

gpio/mxc: move irq_to_gpio() into gpio-mxc driver

As irq_to_gpio() is only being used by gpio-mxc driver, it should be
moved from mach/gpio.h into gpio-mxc.c.

Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---

diff --git a/arch/arm/plat-mxc/include/mach/gpio.h b/arch/arm/plat-mxc/include/mach/gpio.h
index 38ebebd9d3bbf..72c3ed1cddd58 100644
--- a/arch/arm/plat-mxc/include/mach/gpio.h
+++ b/arch/arm/plat-mxc/include/mach/gpio.h
@@ -34,6 +34,4 @@
 #define gpio_cansleep		__gpio_cansleep
 #define gpio_to_irq		__gpio_to_irq
 
-#define irq_to_gpio(irq)	((irq) - MXC_GPIO_IRQ_START)
-
 #endif
diff --git a/drivers/gpio/gpio-mxc.c b/drivers/gpio/gpio-mxc.c
index 64aff20bc6207..b588f8a41e601 100644
--- a/drivers/gpio/gpio-mxc.c
+++ b/drivers/gpio/gpio-mxc.c
@@ -31,6 +31,8 @@
 #include <linux/of_device.h>
 #include <asm-generic/bug.h>
 
+#define irq_to_gpio(irq)	((irq) - MXC_GPIO_IRQ_START)
+
 enum mxc_gpio_hwtype {
 	IMX1_GPIO,	/* runs on i.mx1 */
 	IMX21_GPIO,	/* runs on i.mx21 and i.mx27 */