| From 72f4433f7378cc35088913722628673571273ed7 Mon Sep 17 00:00:00 2001 |
| From: Lu Baolu <baolu.lu@linux.intel.com> |
| Date: Fri, 7 Apr 2017 17:57:08 +0300 |
| Subject: [PATCH 194/286] usb: xhci: remove xhci_debug_trb() |
| |
| Every XHCI TRB has already been traced by the trb trace events. |
| It is unnecessary to put the same message in kernel log. This |
| patch removes xhci_debug_trb(). |
| |
| Signed-off-by: Lu Baolu <baolu.lu@linux.intel.com> |
| Signed-off-by: Mathias Nyman <mathias.nyman@linux.intel.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| (cherry picked from commit 8c10152ec52b850f9806c5c2f5a93ebe38838959) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| drivers/usb/host/xhci-dbg.c | 57 ------------------------------------------- |
| drivers/usb/host/xhci-ring.c | 4 --- |
| drivers/usb/host/xhci.h | 2 - |
| 3 files changed, 63 deletions(-) |
| |
| --- a/drivers/usb/host/xhci-dbg.c |
| +++ b/drivers/usb/host/xhci-dbg.c |
| @@ -254,63 +254,6 @@ void xhci_print_registers(struct xhci_hc |
| xhci_print_ports(xhci); |
| } |
| |
| -void xhci_print_trb_offsets(struct xhci_hcd *xhci, union xhci_trb *trb) |
| -{ |
| - int i; |
| - for (i = 0; i < 4; i++) |
| - xhci_dbg(xhci, "Offset 0x%x = 0x%x\n", |
| - i*4, trb->generic.field[i]); |
| -} |
| - |
| -/** |
| - * Debug a transfer request block (TRB). |
| - */ |
| -void xhci_debug_trb(struct xhci_hcd *xhci, union xhci_trb *trb) |
| -{ |
| - u64 address; |
| - u32 type = le32_to_cpu(trb->link.control) & TRB_TYPE_BITMASK; |
| - |
| - switch (type) { |
| - case TRB_TYPE(TRB_LINK): |
| - xhci_dbg(xhci, "Link TRB:\n"); |
| - xhci_print_trb_offsets(xhci, trb); |
| - |
| - address = le64_to_cpu(trb->link.segment_ptr); |
| - xhci_dbg(xhci, "Next ring segment DMA address = 0x%llx\n", address); |
| - |
| - xhci_dbg(xhci, "Interrupter target = 0x%x\n", |
| - GET_INTR_TARGET(le32_to_cpu(trb->link.intr_target))); |
| - xhci_dbg(xhci, "Cycle bit = %u\n", |
| - le32_to_cpu(trb->link.control) & TRB_CYCLE); |
| - xhci_dbg(xhci, "Toggle cycle bit = %u\n", |
| - le32_to_cpu(trb->link.control) & LINK_TOGGLE); |
| - xhci_dbg(xhci, "No Snoop bit = %u\n", |
| - le32_to_cpu(trb->link.control) & TRB_NO_SNOOP); |
| - break; |
| - case TRB_TYPE(TRB_TRANSFER): |
| - address = le64_to_cpu(trb->trans_event.buffer); |
| - /* |
| - * FIXME: look at flags to figure out if it's an address or if |
| - * the data is directly in the buffer field. |
| - */ |
| - xhci_dbg(xhci, "DMA address or buffer contents= %llu\n", address); |
| - break; |
| - case TRB_TYPE(TRB_COMPLETION): |
| - address = le64_to_cpu(trb->event_cmd.cmd_trb); |
| - xhci_dbg(xhci, "Command TRB pointer = %llu\n", address); |
| - xhci_dbg(xhci, "Completion status = %u\n", |
| - GET_COMP_CODE(le32_to_cpu(trb->event_cmd.status))); |
| - xhci_dbg(xhci, "Flags = 0x%x\n", |
| - le32_to_cpu(trb->event_cmd.flags)); |
| - break; |
| - default: |
| - xhci_dbg(xhci, "Unknown TRB with TRB type ID %u\n", |
| - (unsigned int) type>>10); |
| - xhci_print_trb_offsets(xhci, trb); |
| - break; |
| - } |
| -} |
| - |
| void xhci_dbg_erst(struct xhci_hcd *xhci, struct xhci_erst *erst) |
| { |
| u64 addr = erst->erst_dma_addr; |
| --- a/drivers/usb/host/xhci-ring.c |
| +++ b/drivers/usb/host/xhci-ring.c |
| @@ -2466,10 +2466,6 @@ static int handle_tx_event(struct xhci_h |
| xhci_warn(xhci, "WARN Event TRB for slot %d ep %d with no TDs queued?\n", |
| TRB_TO_SLOT_ID(le32_to_cpu(event->flags)), |
| ep_index); |
| - xhci_dbg(xhci, "Event TRB with TRB type ID %u\n", |
| - (le32_to_cpu(event->flags) & |
| - TRB_TYPE_BITMASK)>>10); |
| - xhci_print_trb_offsets(xhci, (union xhci_trb *) event); |
| } |
| if (ep->skip) { |
| ep->skip = false; |
| --- a/drivers/usb/host/xhci.h |
| +++ b/drivers/usb/host/xhci.h |
| @@ -1928,8 +1928,6 @@ void xhci_print_ir_set(struct xhci_hcd * |
| void xhci_print_registers(struct xhci_hcd *xhci); |
| void xhci_dbg_regs(struct xhci_hcd *xhci); |
| void xhci_print_run_regs(struct xhci_hcd *xhci); |
| -void xhci_print_trb_offsets(struct xhci_hcd *xhci, union xhci_trb *trb); |
| -void xhci_debug_trb(struct xhci_hcd *xhci, union xhci_trb *trb); |
| void xhci_dbg_erst(struct xhci_hcd *xhci, struct xhci_erst *erst); |
| void xhci_dbg_cmd_ptrs(struct xhci_hcd *xhci); |
| void xhci_dbg_ctx(struct xhci_hcd *xhci, struct xhci_container_ctx *ctx, unsigned int last_ep); |