1 files changed, 3 insertions, 6 deletions

diff --git a/arch/arm/mach-omap1/board-h2.c b/arch/arm/mach-omap1/board-h2.c
index 3b65914b9141..a2914ac4a202 100644
--- a/arch/arm/mach-omap1/board-h2.c
+++ b/arch/arm/mach-omap1/board-h2.c
@@ -250,11 +250,8 @@ static struct platform_device h2_kp_device = {
 #if defined(CONFIG_OMAP_IR) || defined(CONFIG_OMAP_IR_MODULE)
 static int h2_transceiver_mode(struct device *dev, int state)
 {
-        if (state & IR_SIRMODE)
-                omap_set_gpio_dataout(H2_IRDA_FIRSEL_GPIO_PIN, 0);
-        else    /* MIR/FIR */
-                omap_set_gpio_dataout(H2_IRDA_FIRSEL_GPIO_PIN, 1);
-
+        /* SIR when low, else MIR/FIR when HIGH */
+        gpio_set_value(H2_IRDA_FIRSEL_GPIO_PIN, !(state & IR_SIRMODE));
         return 0;
 }
 #endif
@@ -409,7 +406,7 @@ static struct omap_board_config_kernel h2_config[] __initdata = {
 
 static int h2_nand_dev_ready(struct omap_nand_platform_data *data)
 {
-        return omap_get_gpio_datain(H2_NAND_RB_GPIO_PIN);
+        return gpio_get_value(H2_NAND_RB_GPIO_PIN);
 }
 
 static void __init h2_init(void)