| From 33440e3b5db548f59d032496475aa12c482c7146 Mon Sep 17 00:00:00 2001 |
| From: Lu Baolu <baolu.lu@linux.intel.com> |
| Date: Fri, 8 Dec 2017 17:59:12 +0200 |
| Subject: [PATCH 0529/1795] usb: xhci: Cleanup printk debug message for ERST |
| |
| Each event segment has been exposed through debugfs. There is no |
| need to dump ERST content with printk in code. Remove it to make |
| code more concise and readable. |
| |
| 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 3054ea45fb8758b7c1a4849001e213e1267452fa) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> |
| --- |
| drivers/usb/host/xhci-dbg.c | 18 ------------------ |
| drivers/usb/host/xhci.c | 2 -- |
| drivers/usb/host/xhci.h | 1 - |
| 3 files changed, 21 deletions(-) |
| |
| diff --git a/drivers/usb/host/xhci-dbg.c b/drivers/usb/host/xhci-dbg.c |
| index f20ef2ef1cb2..386abf26641d 100644 |
| --- a/drivers/usb/host/xhci-dbg.c |
| +++ b/drivers/usb/host/xhci-dbg.c |
| @@ -10,24 +10,6 @@ |
| |
| #include "xhci.h" |
| |
| -void xhci_dbg_erst(struct xhci_hcd *xhci, struct xhci_erst *erst) |
| -{ |
| - u64 addr = erst->erst_dma_addr; |
| - int i; |
| - struct xhci_erst_entry *entry; |
| - |
| - for (i = 0; i < erst->num_entries; i++) { |
| - entry = &erst->entries[i]; |
| - xhci_dbg(xhci, "@%016llx %08x %08x %08x %08x\n", |
| - addr, |
| - lower_32_bits(le64_to_cpu(entry->seg_addr)), |
| - upper_32_bits(le64_to_cpu(entry->seg_addr)), |
| - le32_to_cpu(entry->seg_size), |
| - le32_to_cpu(entry->rsvd)); |
| - addr += sizeof(*entry); |
| - } |
| -} |
| - |
| char *xhci_get_slot_state(struct xhci_hcd *xhci, |
| struct xhci_container_ctx *ctx) |
| { |
| diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c |
| index b2238ca1c925..786cca0eb73c 100644 |
| --- a/drivers/usb/host/xhci.c |
| +++ b/drivers/usb/host/xhci.c |
| @@ -574,8 +574,6 @@ int xhci_run(struct usb_hcd *hcd) |
| if (ret) |
| return ret; |
| |
| - xhci_dbg(xhci, "ERST memory map follows:\n"); |
| - xhci_dbg_erst(xhci, &xhci->erst); |
| temp_64 = xhci_read_64(xhci, &xhci->ir_set->erst_dequeue); |
| temp_64 &= ~ERST_PTR_MASK; |
| xhci_dbg_trace(xhci, trace_xhci_dbg_init, |
| diff --git a/drivers/usb/host/xhci.h b/drivers/usb/host/xhci.h |
| index 9760e54ecd4d..68f314e49d07 100644 |
| --- a/drivers/usb/host/xhci.h |
| +++ b/drivers/usb/host/xhci.h |
| @@ -1931,7 +1931,6 @@ static inline int xhci_link_trb_quirk(struct xhci_hcd *xhci) |
| } |
| |
| /* xHCI debugging */ |
| -void xhci_dbg_erst(struct xhci_hcd *xhci, struct xhci_erst *erst); |
| char *xhci_get_slot_state(struct xhci_hcd *xhci, |
| struct xhci_container_ctx *ctx); |
| void xhci_dbg_trace(struct xhci_hcd *xhci, void (*trace)(struct va_format *), |
| -- |
| 2.19.0 |
| |