diff options
author | Shawn Guo <shawn.guo@linaro.org> | 2011-08-13 12:14:04 -0400 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2011-08-17 02:31:04 -0400 |
commit | a4395612290c7b70041952add7ad75b534c8b40c (patch) | |
tree | ab8fe16bb514742160f6aa1a3bee9aa775d999a9 | |
parent | df1bac2e2f180752ac3ae04fbc78366720a2074f (diff) |
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>
-rw-r--r-- | arch/arm/plat-mxc/include/mach/gpio.h | 2 | ||||
-rw-r--r-- | drivers/gpio/gpio-mxc.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/plat-mxc/include/mach/gpio.h b/arch/arm/plat-mxc/include/mach/gpio.h index 38ebebd9d3bb..72c3ed1cddd5 100644 --- a/arch/arm/plat-mxc/include/mach/gpio.h +++ b/arch/arm/plat-mxc/include/mach/gpio.h | |||
@@ -34,6 +34,4 @@ | |||
34 | #define gpio_cansleep __gpio_cansleep | 34 | #define gpio_cansleep __gpio_cansleep |
35 | #define gpio_to_irq __gpio_to_irq | 35 | #define gpio_to_irq __gpio_to_irq |
36 | 36 | ||
37 | #define irq_to_gpio(irq) ((irq) - MXC_GPIO_IRQ_START) | ||
38 | |||
39 | #endif | 37 | #endif |
diff --git a/drivers/gpio/gpio-mxc.c b/drivers/gpio/gpio-mxc.c index 64aff20bc620..b588f8a41e60 100644 --- a/drivers/gpio/gpio-mxc.c +++ b/drivers/gpio/gpio-mxc.c | |||
@@ -31,6 +31,8 @@ | |||
31 | #include <linux/of_device.h> | 31 | #include <linux/of_device.h> |
32 | #include <asm-generic/bug.h> | 32 | #include <asm-generic/bug.h> |
33 | 33 | ||
34 | #define irq_to_gpio(irq) ((irq) - MXC_GPIO_IRQ_START) | ||
35 | |||
34 | enum mxc_gpio_hwtype { | 36 | enum mxc_gpio_hwtype { |
35 | IMX1_GPIO, /* runs on i.mx1 */ | 37 | IMX1_GPIO, /* runs on i.mx1 */ |
36 | IMX21_GPIO, /* runs on i.mx21 and i.mx27 */ | 38 | IMX21_GPIO, /* runs on i.mx21 and i.mx27 */ |