On Friday 28 November 2008, Tony Lindgren wrote: > From: Jarkko Nikula <jarkko.nikula@xxxxxxxxx> > > Switch to gpio_request/free calls > > Cc: linux-usb@xxxxxxxxxxxxxxx > Signed-off-by: Jarkko Nikula <jarkko.nikula@xxxxxxxxx> > Signed-off-by: Tony Lindgren <tony@xxxxxxxxxxx> Acked-by: David Brownell <dbrownell@xxxxxxxxxxxxxxxxxxxxx> Best if this merges through the ARM tree, with other similar changes, since ISTR this won't apply as-is through the USB tree. > --- > 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 22f6d19..4bbddb7 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); > > -- > To unsubscribe from this list: send the line "unsubscribe linux-omap" in > the body of a message to majordomo@xxxxxxxxxxxxxxx > More majordomo info at http://vger.kernel.org/majordomo-info.html > > -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
