mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 02:32:09 -04:00
ARM: OMAP: Fix gpio by switching to generic gpio calls, v2
Fix compile by removing remaining omap specific gpio calls. Based on earlier patches by Jarkko Nikula. Also remove old GPIO key code, there is already a patch to do this with gpio_keys. Signed-off-by: Jarkko Nikula <[email protected]> Signed-off-by: Tony Lindgren <[email protected]>
This commit is contained in:
parent
dc0e88c7e1
commit
73069e388d
5 changed files with 13 additions and 75 deletions
|
|
@ -629,7 +629,7 @@ static int __devinit omap2_onenand_probe(struct platform_device *pdev)
|
|||
}
|
||||
|
||||
if (c->gpio_irq) {
|
||||
if ((r = omap_request_gpio(c->gpio_irq)) < 0) {
|
||||
if ((r = gpio_request(c->gpio_irq, "OneNAND irq")) < 0) {
|
||||
dev_err(&pdev->dev, "Failed to request GPIO%d for "
|
||||
"OneNAND\n", c->gpio_irq);
|
||||
goto err_iounmap;
|
||||
|
|
@ -726,7 +726,7 @@ err_release_dma:
|
|||
free_irq(gpio_to_irq(c->gpio_irq), c);
|
||||
err_release_gpio:
|
||||
if (c->gpio_irq)
|
||||
omap_free_gpio(c->gpio_irq);
|
||||
gpio_free(c->gpio_irq);
|
||||
err_iounmap:
|
||||
iounmap(c->onenand.base);
|
||||
err_release_mem_region:
|
||||
|
|
@ -761,7 +761,7 @@ static int __devexit omap2_onenand_remove(struct platform_device *pdev)
|
|||
platform_set_drvdata(pdev, NULL);
|
||||
if (c->gpio_irq) {
|
||||
free_irq(gpio_to_irq(c->gpio_irq), c);
|
||||
omap_free_gpio(c->gpio_irq);
|
||||
gpio_free(c->gpio_irq);
|
||||
}
|
||||
iounmap(c->onenand.base);
|
||||
release_mem_region(c->phys_base, ONENAND_IO_SIZE);
|
||||
|
|
|
|||
Loading…
Reference in a new issue