use gpio_to_irq (OMAP tree only)

[linux-2.6-omap-h63xx.git] / drivers / cbus / retu.c

diff --git a/drivers/cbus/retu.c b/drivers/cbus/retu.c
index 981bbe1700303f4729536c000422f6fcb38e880a..5f9a20acfa23f22a3db86fbbfc536d77535c53a4 100644 (file)
--- a/drivers/cbus/retu.c
+++ b/drivers/cbus/retu.c
@@ -344,7 +344,7 @@ static int __devinit retu_probe(struct device *dev)
        gpio_direction_input(retu_irq_pin);
 
        /* Rising edge triggers the IRQ */
-       set_irq_type(OMAP_GPIO_IRQ(retu_irq_pin), IRQ_TYPE_EDGE_RISING);
+       set_irq_type(gpio_to_irq(retu_irq_pin), IRQ_TYPE_EDGE_RISING);
 
        retu_initialized = 1;
 
@@ -358,14 +358,14 @@ static int __devinit retu_probe(struct device *dev)
        /* Mask all RETU interrupts */
        retu_write_reg(RETU_REG_IMR, 0xffff);
 
-       ret = request_irq(OMAP_GPIO_IRQ(retu_irq_pin), retu_irq_handler, 0,
+       ret = request_irq(gpio_to_irq(retu_irq_pin), retu_irq_handler, 0,
                          "retu", 0);
        if (ret < 0) {
                printk(KERN_ERR PFX "Unable to register IRQ handler\n");
                omap_free_gpio(retu_irq_pin);
                return ret;
        }
-       set_irq_wake(OMAP_GPIO_IRQ(retu_irq_pin), 1);
+       set_irq_wake(gpio_to_irq(retu_irq_pin), 1);
 
        /* Register power off function */
        pm_power_off = retu_power_off;
@@ -374,7 +374,7 @@ static int __devinit retu_probe(struct device *dev)
        /* Initialize user-space interface */
        if (retu_user_init() < 0) {
                printk(KERN_ERR "Unable to initialize driver\n");
-               free_irq(OMAP_GPIO_IRQ(retu_irq_pin), 0);
+               free_irq(gpio_to_irq(retu_irq_pin), 0);
                omap_free_gpio(retu_irq_pin);
                return ret;
        }
@@ -390,7 +390,7 @@ static int retu_remove(struct device *dev)
 #endif
        /* Mask all RETU interrupts */
        retu_write_reg(RETU_REG_IMR, 0xffff);
-       free_irq(OMAP_GPIO_IRQ(retu_irq_pin), 0);
+       free_irq(gpio_to_irq(retu_irq_pin), 0);
        omap_free_gpio(retu_irq_pin);
        tasklet_kill(&retu_tasklet);