summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap1/serial.c
diff options
context:
space:
mode:
authorDavid Brownell2008-12-11 02:35:26 +0100
committerTony Lindgren2008-12-11 02:35:26 +0100
commit15f74b0335962e8554c91e52d588dc9f8ee7098d (patch)
treeb5cf73b94f6c993822f4b40762c5ccb7540ed7cb /arch/arm/mach-omap1/serial.c
parentARM: OMAP: switch to gpio_direction_output (diff)
downloadkernel-qcow2-linux-15f74b0335962e8554c91e52d588dc9f8ee7098d.tar.gz
kernel-qcow2-linux-15f74b0335962e8554c91e52d588dc9f8ee7098d.tar.xz
kernel-qcow2-linux-15f74b0335962e8554c91e52d588dc9f8ee7098d.zip
ARM: OMAP: use gpio_to_irq
Have most uses of OMAP_GPIO_IRQ() use gpio_to_irq() instead. Calls used for table initialization are left alone, at least this time around. (This patch is for code in both the OMAP tree and mainline.) Signed-off-by: David Brownell <dbrownell@users.sourceforge.net> Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/mach-omap1/serial.c')
-rw-r--r--arch/arm/mach-omap1/serial.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-omap1/serial.c b/arch/arm/mach-omap1/serial.c
index 1a0bc47a67c8..b63da3f70c3f 100644
--- a/arch/arm/mach-omap1/serial.c
+++ b/arch/arm/mach-omap1/serial.c
@@ -251,7 +251,7 @@ static void __init omap_serial_set_port_wakeup(int gpio_nr)
return;
}
gpio_direction_input(gpio_nr);
- ret = request_irq(OMAP_GPIO_IRQ(gpio_nr), &omap_serial_wake_interrupt,
+ ret = request_irq(gpio_to_irq(gpio_nr), &omap_serial_wake_interrupt,
IRQF_TRIGGER_RISING, "serial wakeup", NULL);
if (ret) {
omap_free_gpio(gpio_nr);
@@ -259,7 +259,7 @@ static void __init omap_serial_set_port_wakeup(int gpio_nr)
gpio_nr);
return;
}
- enable_irq_wake(OMAP_GPIO_IRQ(gpio_nr));
+ enable_irq_wake(gpio_to_irq(gpio_nr));
}
static int __init omap_serial_wakeup_init(void)