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>
This commit is contained in:

committed by
Tony Lindgren

parent
e918edf7c2
commit
15f74b0335
@@ -636,7 +636,7 @@ static int __devinit omap2_onenand_probe(struct platform_device *pdev)
|
||||
}
|
||||
gpio_direction_input(c->gpio_irq);
|
||||
|
||||
if ((r = request_irq(OMAP_GPIO_IRQ(c->gpio_irq),
|
||||
if ((r = request_irq(gpio_to_irq(c->gpio_irq),
|
||||
omap2_onenand_interrupt, IRQF_TRIGGER_RISING,
|
||||
pdev->dev.driver->name, c)) < 0)
|
||||
goto err_release_gpio;
|
||||
@@ -723,7 +723,7 @@ err_release_dma:
|
||||
if (c->dma_channel != -1)
|
||||
omap_free_dma(c->dma_channel);
|
||||
if (c->gpio_irq)
|
||||
free_irq(OMAP_GPIO_IRQ(c->gpio_irq), c);
|
||||
free_irq(gpio_to_irq(c->gpio_irq), c);
|
||||
err_release_gpio:
|
||||
if (c->gpio_irq)
|
||||
omap_free_gpio(c->gpio_irq);
|
||||
@@ -760,7 +760,7 @@ static int __devexit omap2_onenand_remove(struct platform_device *pdev)
|
||||
omap2_onenand_shutdown(pdev);
|
||||
platform_set_drvdata(pdev, NULL);
|
||||
if (c->gpio_irq) {
|
||||
free_irq(OMAP_GPIO_IRQ(c->gpio_irq), c);
|
||||
free_irq(gpio_to_irq(c->gpio_irq), c);
|
||||
omap_free_gpio(c->gpio_irq);
|
||||
}
|
||||
iounmap(c->onenand.base);
|
||||
|
Reference in New Issue
Block a user