diff options
author | Shawn Guo <shawn.guo@linaro.org> | 2011-12-04 21:12:28 -0500 |
---|---|---|
committer | Shawn Guo <shawn.guo@linaro.org> | 2012-07-01 09:57:16 -0400 |
commit | 438196c371cb32f0eacaf2a44166d9a0cf37c4a8 (patch) | |
tree | 8e502f38302ba1226444c73aaa84aae86464583f /arch/arm/mach-imx/mach-pca100.c | |
parent | ed175343b4b53d686e30b1e37fb94e142f56fa2f (diff) |
ARM: imx: eliminate macro IRQ_GPIOx()
This patch changes all the static gpio irq number assigning with
IRQ_GPIOA() ... IRQ_GPIOF() to run-time assigning with gpio_to_irq
call, and in turn eliminates these macros.
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Acked-by: Sascha Hauer <s.hauer@pengutronix.de>
Acked-by: Dong Aisheng <dong.aisheng@linaro.org>
Diffstat (limited to 'arch/arm/mach-imx/mach-pca100.c')
-rw-r--r-- | arch/arm/mach-imx/mach-pca100.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-imx/mach-pca100.c b/arch/arm/mach-imx/mach-pca100.c index 541152e450c4..8b1dfa277fd5 100644 --- a/arch/arm/mach-imx/mach-pca100.c +++ b/arch/arm/mach-imx/mach-pca100.c | |||
@@ -245,7 +245,7 @@ static int pca100_sdhc2_init(struct device *dev, irq_handler_t detect_irq, | |||
245 | { | 245 | { |
246 | int ret; | 246 | int ret; |
247 | 247 | ||
248 | ret = request_irq(IRQ_GPIOC(29), detect_irq, | 248 | ret = request_irq(gpio_to_irq(IMX_GPIO_NR(3, 29)), detect_irq, |
249 | IRQF_DISABLED | IRQF_TRIGGER_FALLING, | 249 | IRQF_DISABLED | IRQF_TRIGGER_FALLING, |
250 | "imx-mmc-detect", data); | 250 | "imx-mmc-detect", data); |
251 | if (ret) | 251 | if (ret) |
@@ -257,7 +257,7 @@ static int pca100_sdhc2_init(struct device *dev, irq_handler_t detect_irq, | |||
257 | 257 | ||
258 | static void pca100_sdhc2_exit(struct device *dev, void *data) | 258 | static void pca100_sdhc2_exit(struct device *dev, void *data) |
259 | { | 259 | { |
260 | free_irq(IRQ_GPIOC(29), data); | 260 | free_irq(gpio_to_irq(IMX_GPIO_NR(3, 29)), data); |
261 | } | 261 | } |
262 | 262 | ||
263 | static const struct imxmmc_platform_data sdhc_pdata __initconst = { | 263 | static const struct imxmmc_platform_data sdhc_pdata __initconst = { |