Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 944e1bff authored by Jarkko Nikula's avatar Jarkko Nikula Committed by Tony Lindgren
Browse files

ARM: OMAP: Switch ohci-omap to gpio_request/free calls 



Switch to gpio_request/free calls

Cc: linux-usb@vger.kernel.org
Acked-by: default avatarDavid Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: default avatarJarkko Nikula <jarkko.nikula@nokia.com>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent f2d18fea

drivers/usb/host/ohci-omap.c

+3 −3
Original line number Diff line number Diff line
@@ -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);