diff options
| author | Jarkko Nikula <jarkko.nikula@nokia.com> | 2008-12-11 04:35:30 +0300 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2008-12-11 04:35:30 +0300 |
| commit | f2d18fea8b87d09bdda22cc67c36f5f463452a33 (patch) | |
| tree | a8641626136a6f14d2873e13f263fa0de6ab04f8 /arch/arm/mach-omap1/serial.c | |
| parent | e031ab23deb5a5d9ac5744e69a0627823e81b074 (diff) | |
| download | linux-f2d18fea8b87d09bdda22cc67c36f5f463452a33.tar.xz | |
ARM: OMAP: Switch to gpio_request/free calls
Switch to gpio_request/free calls
Signed-off-by: Jarkko Nikula <jarkko.nikula@nokia.com>
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.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-omap1/serial.c b/arch/arm/mach-omap1/serial.c index b63da3f70c3f..0002084e0655 100644 --- a/arch/arm/mach-omap1/serial.c +++ b/arch/arm/mach-omap1/serial.c @@ -244,7 +244,7 @@ static void __init omap_serial_set_port_wakeup(int gpio_nr) { int ret; - ret = omap_request_gpio(gpio_nr); + ret = gpio_request(gpio_nr, "UART wake"); if (ret < 0) { printk(KERN_ERR "Could not request UART wake GPIO: %i\n", gpio_nr); @@ -254,7 +254,7 @@ static void __init omap_serial_set_port_wakeup(int gpio_nr) 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); + gpio_free(gpio_nr); printk(KERN_ERR "No interrupt for UART wake GPIO: %i\n", gpio_nr); return; |