diff options
| author | Jarkko Nikula <jarkko.nikula@nokia.com> | 2008-12-10 17:35:31 -0800 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2008-12-10 17:35:31 -0800 |
| commit | 944e1bffb6517590be48dd428d9b73da9fea801c (patch) | |
| tree | 4fc9e688dfbaf772d6a7162bec2a1c27515baadb /drivers/usb/host/ohci-omap.c | |
| parent | f2d18fea8b87d09bdda22cc67c36f5f463452a33 (diff) | |
| download | linux-stable-944e1bffb6517590be48dd428d9b73da9fea801c.tar.gz linux-stable-944e1bffb6517590be48dd428d9b73da9fea801c.tar.bz2 linux-stable-944e1bffb6517590be48dd428d9b73da9fea801c.zip | |
ARM: OMAP: Switch ohci-omap to gpio_request/free calls
Switch to gpio_request/free calls
Cc: linux-usb@vger.kernel.org
Acked-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Jarkko Nikula <jarkko.nikula@nokia.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'drivers/usb/host/ohci-omap.c')
| -rw-r--r-- | drivers/usb/host/ohci-omap.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/usb/host/ohci-omap.c b/drivers/usb/host/ohci-omap.c index 22f6d1900b55..4bbddb73abd9 100644 --- a/drivers/usb/host/ohci-omap.c +++ b/drivers/usb/host/ohci-omap.c @@ -18,6 +18,7 @@ #include <linux/jiffies.h> #include <linux/platform_device.h> #include <linux/clk.h> +#include <linux/gpio.h> #include <mach/hardware.h> #include <asm/io.h> @@ -25,7 +26,6 @@ #include <mach/mux.h> #include <mach/irqs.h> -#include <mach/gpio.h> #include <mach/fpga.h> #include <mach/usb.h> @@ -254,7 +254,7 @@ static int ohci_omap_init(struct usb_hcd *hcd) /* gpio9 for overcurrent detction */ omap_cfg_reg(W8_1610_GPIO9); - omap_request_gpio(9); + gpio_request(9, "OHCI overcurrent"); gpio_direction_input(9); /* for paranoia's sake: disable USB.PUEN */ @@ -407,7 +407,7 @@ usb_hcd_omap_remove (struct usb_hcd *hcd, struct platform_device *pdev) put_device(ohci->transceiver->dev); } if (machine_is_omap_osk()) - omap_free_gpio(9); + gpio_free(9); iounmap(hcd->regs); release_mem_region(hcd->rsrc_start, hcd->rsrc_len); usb_put_hcd(hcd); |