diff options
| author | Jarkko Nikula <jarkko.nikula@nokia.com> | 2009-01-15 13:09:52 +0200 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2009-01-15 13:09:52 +0200 |
| commit | 73069e388d0f2509e45e1a58b0facca99ef2446e (patch) | |
| tree | c9c69ad9df07bbc2f809faa718d65b6773e9f9d9 /drivers/mtd | |
| parent | dc0e88c7e15acbe3d7e8682312f709938f0dcf01 (diff) | |
| download | kernel_samsung_smdk4412-73069e388d0f2509e45e1a58b0facca99ef2446e.tar.gz kernel_samsung_smdk4412-73069e388d0f2509e45e1a58b0facca99ef2446e.tar.bz2 kernel_samsung_smdk4412-73069e388d0f2509e45e1a58b0facca99ef2446e.zip | |
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 <jarkko.nikula@nokia.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'drivers/mtd')
| -rw-r--r-- | drivers/mtd/onenand/omap2.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/mtd/onenand/omap2.c b/drivers/mtd/onenand/omap2.c index 96ecc1766fa..77a4f144615 100644 --- a/drivers/mtd/onenand/omap2.c +++ b/drivers/mtd/onenand/omap2.c @@ -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); |