diff options
author | David Brownell <dbrownell@users.sourceforge.net> | 2008-09-11 04:53:23 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2008-10-17 17:40:59 -0400 |
commit | c767c1c6f1febbd1351cc152bba6e37889322d17 (patch) | |
tree | 8385c715dbdeef2b90f11dcef7b3e0dcdf49992a /drivers/usb/musb/musb_host.c | |
parent | 64ca44a65adf131c4df5124fe0fcdc3896f0f0dc (diff) |
usb: musb_hdrc build fixes
Minor musb_hdrc updates:
- so it'll build on DaVinci, given relevant platform updates;
* remove support for an un-shipped OTG prototype
* rely on gpiolib framework conversion for the I2C GPIOs
* the <asm/arch/hdrc_cnf.h> mechanism has been removed
- catch comments up to the recent removal of the per-SOC header
with the silicon configuration data;
- and remove two inappropriate "inline" declarations which
just bloat host side code.
There are still some more <asm/arch/XYZ.h> ==> <mach/XYZ.h>
changes needed in this driver, catching up to the relocation
of most of the include/asm-arm/arch-* contents.
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
Cc: stable <stable@kernel.org> [2.6.27]
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb/musb/musb_host.c')
-rw-r--r-- | drivers/usb/musb/musb_host.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/usb/musb/musb_host.c b/drivers/usb/musb/musb_host.c index 17b5c189250e..3133990f04ec 100644 --- a/drivers/usb/musb/musb_host.c +++ b/drivers/usb/musb/musb_host.c | |||
@@ -108,7 +108,7 @@ static void musb_ep_program(struct musb *musb, u8 epnum, | |||
108 | /* | 108 | /* |
109 | * Clear TX fifo. Needed to avoid BABBLE errors. | 109 | * Clear TX fifo. Needed to avoid BABBLE errors. |
110 | */ | 110 | */ |
111 | static inline void musb_h_tx_flush_fifo(struct musb_hw_ep *ep) | 111 | static void musb_h_tx_flush_fifo(struct musb_hw_ep *ep) |
112 | { | 112 | { |
113 | void __iomem *epio = ep->regs; | 113 | void __iomem *epio = ep->regs; |
114 | u16 csr; | 114 | u16 csr; |
@@ -435,7 +435,7 @@ musb_advance_schedule(struct musb *musb, struct urb *urb, | |||
435 | } | 435 | } |
436 | } | 436 | } |
437 | 437 | ||
438 | static inline u16 musb_h_flush_rxfifo(struct musb_hw_ep *hw_ep, u16 csr) | 438 | static u16 musb_h_flush_rxfifo(struct musb_hw_ep *hw_ep, u16 csr) |
439 | { | 439 | { |
440 | /* we don't want fifo to fill itself again; | 440 | /* we don't want fifo to fill itself again; |
441 | * ignore dma (various models), | 441 | * ignore dma (various models), |
@@ -1004,7 +1004,7 @@ static bool musb_h_ep0_continue(struct musb *musb, u16 len, struct urb *urb) | |||
1004 | 1004 | ||
1005 | /* | 1005 | /* |
1006 | * Handle default endpoint interrupt as host. Only called in IRQ time | 1006 | * Handle default endpoint interrupt as host. Only called in IRQ time |
1007 | * from the LinuxIsr() interrupt service routine. | 1007 | * from musb_interrupt(). |
1008 | * | 1008 | * |
1009 | * called with controller irqlocked | 1009 | * called with controller irqlocked |
1010 | */ | 1010 | */ |