diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2010-07-22 16:57:38 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-07-22 16:57:38 -0700 |
| commit | 6bbbb136e761db39158852c9b42619c2438e9d45 (patch) | |
| tree | 4b48eba7be3ba0e7ffbddc0fee4988d26623099a /usb/usb-xhci-remove-redundant-print-messages.patch | |
| parent | 5caca10b163e38f1671c4be83c480581da4d90d6 (diff) | |
| download | patches-6bbbb136e761db39158852c9b42619c2438e9d45.tar.gz | |
lots of patches
Diffstat (limited to 'usb/usb-xhci-remove-redundant-print-messages.patch')
| -rw-r--r-- | usb/usb-xhci-remove-redundant-print-messages.patch | 70 |
1 files changed, 70 insertions, 0 deletions
diff --git a/usb/usb-xhci-remove-redundant-print-messages.patch b/usb/usb-xhci-remove-redundant-print-messages.patch new file mode 100644 index 00000000000000..224e660583fc3c --- /dev/null +++ b/usb/usb-xhci-remove-redundant-print-messages.patch @@ -0,0 +1,70 @@ +From sarah.a.sharp@linux.intel.com Thu Jul 22 16:16:27 2010 +Date: Thu, 22 Jul 2010 15:23:15 -0700 +From: Andiry Xu <andiry.xu@amd.com> +To: Greg KH <gregkh@suse.de> +Cc: linux-usb@vger.kernel.org, Andiry Xu <andiry.xu@amd.com> +Subject: USB: xHCI: remove redundant print messages +Message-ID: <20100722222315.GA21323@xanatos> +Content-Disposition: inline + +From: Andiry Xu <andiry.xu@amd.com> + +Remove redundant print messages in the interrupt context. + +Signed-off-by: Andiry Xu <andiry.xu@amd.com> +Signed-off-by: Sarah Sharp <sarah.a.sharp@linux.intel.com> +Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> + +--- + drivers/usb/host/xhci-ring.c | 15 --------------- + 1 file changed, 15 deletions(-) + +--- a/drivers/usb/host/xhci-ring.c ++++ b/drivers/usb/host/xhci-ring.c +@@ -1592,7 +1592,6 @@ static int handle_tx_event(struct xhci_h + u32 trb_comp_code; + int ret = 0; + +- xhci_dbg(xhci, "In %s\n", __func__); + slot_id = TRB_TO_SLOT_ID(event->flags); + xdev = xhci->devs[slot_id]; + if (!xdev) { +@@ -1614,7 +1613,6 @@ static int handle_tx_event(struct xhci_h + + event_dma = event->buffer; + /* This TRB should be in the TD at the head of this ring's TD list */ +- xhci_dbg(xhci, "%s - checking for list empty\n", __func__); + if (list_empty(&ep_ring->td_list)) { + xhci_warn(xhci, "WARN Event TRB for slot %d ep %d with no TDs queued?\n", + TRB_TO_SLOT_ID(event->flags), ep_index); +@@ -1623,30 +1621,17 @@ static int handle_tx_event(struct xhci_h + xhci_print_trb_offsets(xhci, (union xhci_trb *) event); + goto cleanup; + } +- xhci_dbg(xhci, "%s - getting list entry\n", __func__); + td = list_entry(ep_ring->td_list.next, struct xhci_td, td_list); + + /* Is this a TRB in the currently executing TD? */ +- xhci_dbg(xhci, "%s - looking for TD\n", __func__); + event_seg = trb_in_td(ep_ring->deq_seg, ep_ring->dequeue, + td->last_trb, event_dma); +- xhci_dbg(xhci, "%s - found event_seg = %p\n", __func__, event_seg); + if (!event_seg) { + /* HC is busted, give up! */ + xhci_err(xhci, "ERROR Transfer event TRB DMA ptr not part of current TD\n"); + return -ESHUTDOWN; + } + event_trb = &event_seg->trbs[(event_dma - event_seg->dma) / sizeof(*event_trb)]; +- xhci_dbg(xhci, "Event TRB with TRB type ID %u\n", +- (unsigned int) (event->flags & TRB_TYPE_BITMASK)>>10); +- xhci_dbg(xhci, "Offset 0x00 (buffer lo) = 0x%x\n", +- lower_32_bits(event->buffer)); +- xhci_dbg(xhci, "Offset 0x04 (buffer hi) = 0x%x\n", +- upper_32_bits(event->buffer)); +- xhci_dbg(xhci, "Offset 0x08 (transfer length) = 0x%x\n", +- (unsigned int) event->transfer_len); +- xhci_dbg(xhci, "Offset 0x0C (flags) = 0x%x\n", +- (unsigned int) event->flags); + + /* Look for common error cases */ + trb_comp_code = GET_COMP_CODE(event->transfer_len); |