diff options
Diffstat (limited to 'meta/recipes-kernel/linux/linux-omap-2.6.29/musb/0013-musb_host-refactor-musb_save_toggle-take-2.patch')
-rw-r--r-- | meta/recipes-kernel/linux/linux-omap-2.6.29/musb/0013-musb_host-refactor-musb_save_toggle-take-2.patch | 91 |
1 files changed, 0 insertions, 91 deletions
diff --git a/meta/recipes-kernel/linux/linux-omap-2.6.29/musb/0013-musb_host-refactor-musb_save_toggle-take-2.patch b/meta/recipes-kernel/linux/linux-omap-2.6.29/musb/0013-musb_host-refactor-musb_save_toggle-take-2.patch deleted file mode 100644 index 0202871d4..000000000 --- a/meta/recipes-kernel/linux/linux-omap-2.6.29/musb/0013-musb_host-refactor-musb_save_toggle-take-2.patch +++ /dev/null @@ -1,91 +0,0 @@ -From 2658f7c9029967501cd4d749364f2e02d02eebd5 Mon Sep 17 00:00:00 2001 -From: Sergei Shtylyov <sshtylyov-hkdhdckH98+B+jHODAdFcQ@public.gmane.org> -Date: Fri, 27 Mar 2009 12:54:21 -0700 -Subject: [PATCH] musb_host: refactor musb_save_toggle() (take 2) - -Refactor musb_save_toggle() as follows: - - - replace 'struct musb_hw_ep *ep' parameter by 'struct - musb_qh *qh' to avoid re-calculating this value - - - move usb_settogle() call out of the *if* operator. - -This is a net minor shrink of source and object code. - -Signed-off-by: Sergei Shtylyov <sshtylyov-hkdhdckH98+B+jHODAdFcQ@public.gmane.org> -Signed-off-by: David Brownell <dbrownell-Rn4VEauK+AKRv+LV9MX5uipxlwaOVQ5f@public.gmane.org> ---- - drivers/usb/musb/musb_host.c | 35 ++++++++++++----------------------- - 1 files changed, 12 insertions(+), 23 deletions(-) - -diff --git a/drivers/usb/musb/musb_host.c b/drivers/usb/musb/musb_host.c -index f6e84a0..dc32ce4 100644 ---- a/drivers/usb/musb/musb_host.c -+++ b/drivers/usb/musb/musb_host.c -@@ -318,35 +318,24 @@ __acquires(musb->lock) - spin_lock(&musb->lock); - } - --/* for bulk/interrupt endpoints only */ --static inline void --musb_save_toggle(struct musb_hw_ep *ep, int is_in, struct urb *urb) -+/* For bulk/interrupt endpoints only */ -+static inline void musb_save_toggle(struct musb_qh *qh, int is_in, -+ struct urb *urb) - { -- struct usb_device *udev = urb->dev; -+ void __iomem *epio = qh->hw_ep->regs; - u16 csr; -- void __iomem *epio = ep->regs; -- struct musb_qh *qh; - -- /* FIXME: the current Mentor DMA code seems to have -+ /* -+ * FIXME: the current Mentor DMA code seems to have - * problems getting toggle correct. - */ - -- if (is_in || ep->is_shared_fifo) -- qh = ep->in_qh; -+ if (is_in) -+ csr = musb_readw(epio, MUSB_RXCSR) & MUSB_RXCSR_H_DATATOGGLE; - else -- qh = ep->out_qh; -+ csr = musb_readw(epio, MUSB_TXCSR) & MUSB_TXCSR_H_DATATOGGLE; - -- if (!is_in) { -- csr = musb_readw(epio, MUSB_TXCSR); -- usb_settoggle(udev, qh->epnum, 1, -- (csr & MUSB_TXCSR_H_DATATOGGLE) -- ? 1 : 0); -- } else { -- csr = musb_readw(epio, MUSB_RXCSR); -- usb_settoggle(udev, qh->epnum, 0, -- (csr & MUSB_RXCSR_H_DATATOGGLE) -- ? 1 : 0); -- } -+ usb_settoggle(urb->dev, qh->epnum, !is_in, csr ? 1 : 0); - } - - /* caller owns controller lock, irqs are blocked */ -@@ -362,7 +351,7 @@ musb_giveback(struct musb_qh *qh, struct urb *urb, int status) - switch (qh->type) { - case USB_ENDPOINT_XFER_BULK: - case USB_ENDPOINT_XFER_INT: -- musb_save_toggle(ep, is_in, urb); -+ musb_save_toggle(qh, is_in, urb); - break; - case USB_ENDPOINT_XFER_ISOC: - if (status == 0 && urb->error_count) -@@ -1362,7 +1351,7 @@ static void musb_bulk_rx_nak_timeout(struct musb *musb, struct musb_hw_ep *ep) - urb->actual_length += dma->actual_len; - dma->actual_len = 0L; - } -- musb_save_toggle(ep, 1, urb); -+ musb_save_toggle(cur_qh, 1, urb); - - /* move cur_qh to end of queue */ - list_move_tail(&cur_qh->ring, &musb->in_bulk); --- -1.6.0.4 - |