Commit 81ec4e4a authored by Sergei Shtylyov's avatar Sergei Shtylyov Committed by Greg Kroah-Hartman

musb_host: streamline musb_cleanup_urb() calls

The argument for the 'is_in' parameter of musb_cleanup_urb()
is always extracted from an URB that's passed to the function.
So that parameter is superfluous; remove it.
Signed-off-by: default avatarSergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: default avatarDavid Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 22a0d6f1
...@@ -2029,14 +2029,15 @@ static int musb_urb_enqueue( ...@@ -2029,14 +2029,15 @@ static int musb_urb_enqueue(
* called with controller locked, irqs blocked * called with controller locked, irqs blocked
* that hardware queue advances to the next transfer, unless prevented * that hardware queue advances to the next transfer, unless prevented
*/ */
static int musb_cleanup_urb(struct urb *urb, struct musb_qh *qh, int is_in) static int musb_cleanup_urb(struct urb *urb, struct musb_qh *qh)
{ {
struct musb_hw_ep *ep = qh->hw_ep; struct musb_hw_ep *ep = qh->hw_ep;
void __iomem *epio = ep->regs; void __iomem *epio = ep->regs;
unsigned hw_end = ep->epnum; unsigned hw_end = ep->epnum;
void __iomem *regs = ep->musb->mregs; void __iomem *regs = ep->musb->mregs;
u16 csr; int is_in = usb_pipein(urb->pipe);
int status = 0; int status = 0;
u16 csr;
musb_ep_select(regs, hw_end); musb_ep_select(regs, hw_end);
...@@ -2137,7 +2138,7 @@ static int musb_urb_dequeue(struct usb_hcd *hcd, struct urb *urb, int status) ...@@ -2137,7 +2138,7 @@ static int musb_urb_dequeue(struct usb_hcd *hcd, struct urb *urb, int status)
kfree(qh); kfree(qh);
} }
} else } else
ret = musb_cleanup_urb(urb, qh, urb->pipe & USB_DIR_IN); ret = musb_cleanup_urb(urb, qh);
done: done:
spin_unlock_irqrestore(&musb->lock, flags); spin_unlock_irqrestore(&musb->lock, flags);
return ret; return ret;
...@@ -2171,7 +2172,7 @@ musb_h_disable(struct usb_hcd *hcd, struct usb_host_endpoint *hep) ...@@ -2171,7 +2172,7 @@ musb_h_disable(struct usb_hcd *hcd, struct usb_host_endpoint *hep)
urb->status = -ESHUTDOWN; urb->status = -ESHUTDOWN;
/* cleanup */ /* cleanup */
musb_cleanup_urb(urb, qh, urb->pipe & USB_DIR_IN); musb_cleanup_urb(urb, qh);
/* Then nuke all the others ... and advance the /* Then nuke all the others ... and advance the
* queue on hw_ep (e.g. bulk ring) when we're done. * queue on hw_ep (e.g. bulk ring) when we're done.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment