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>

1 files changed, 4 insertions, 3 deletions

diff --git a/arch/arm/mach-omap1/board-h3.c b/arch/arm/mach-omap1/board-h3.c
index c524f47cf862..0332203bd53d 100644
--- a/arch/arm/mach-omap1/board-h3.c
+++ b/arch/arm/mach-omap1/board-h3.c
@@ -516,8 +516,9 @@ static void __init h3_init(void)
 
         nand_resource.end = nand_resource.start = OMAP_CS2B_PHYS;
         nand_resource.end += SZ_4K - 1;
-        if (!(omap_request_gpio(H3_NAND_RB_GPIO_PIN)))
-                nand_data.dev_ready = nand_dev_ready;
+        if (gpio_request(H3_NAND_RB_GPIO_PIN, "NAND ready") < 0)
+                BUG();
+        nand_data.dev_ready = nand_dev_ready;
 
         /* GPIO10 Func_MUX_CTRL reg bit 29:27, Configure V2 to mode1 as GPIO */
         /* GPIO10 pullup/down register, Enable pullup on GPIO10 */
@@ -537,7 +538,7 @@ static void __init h3_init(void)
 static void __init h3_init_smc91x(void)
 {
         omap_cfg_reg(W15_1710_GPIO40);
-        if (omap_request_gpio(40) < 0) {
+        if (gpio_request(40, "SMC91x irq") < 0) {
                 printk("Error requesting gpio 40 for smc91x irq\n");
                 return;
         }