diff options
author | Sarah Sharp <sarah.a.sharp@linux.intel.com> | 2011-12-22 18:42:25 -0500 |
---|---|---|
committer | Sarah Sharp <sarah.a.sharp@linux.intel.com> | 2011-12-22 18:52:46 -0500 |
commit | 3d616f5af2a1cf7acce712993402b0ccbb2ff2cc (patch) | |
tree | ee7b35ecd42ea1eeff67793ec3d440d619d8971f /drivers/usb/host/xhci-ring.c | |
parent | c4255f67a869adae49d2ef165bcc9436bb7ec0bb (diff) |
xhci: Remove debugging for individual transfers.
Users can trace the submission of URBs through USBmon, so it makes no
sense to have duplicate debugging in the xHCI driver.
Signed-off-by: Sarah Sharp <sarah.a.sharp@linux.intel.com>
Diffstat (limited to 'drivers/usb/host/xhci-ring.c')
-rw-r--r-- | drivers/usb/host/xhci-ring.c | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/drivers/usb/host/xhci-ring.c b/drivers/usb/host/xhci-ring.c index 4e4f587c144b..8638e101b3c1 100644 --- a/drivers/usb/host/xhci-ring.c +++ b/drivers/usb/host/xhci-ring.c | |||
@@ -1627,7 +1627,6 @@ static int process_ctrl_td(struct xhci_hcd *xhci, struct xhci_td *td, | |||
1627 | ep_ctx = xhci_get_ep_ctx(xhci, xdev->out_ctx, ep_index); | 1627 | ep_ctx = xhci_get_ep_ctx(xhci, xdev->out_ctx, ep_index); |
1628 | trb_comp_code = GET_COMP_CODE(le32_to_cpu(event->transfer_len)); | 1628 | trb_comp_code = GET_COMP_CODE(le32_to_cpu(event->transfer_len)); |
1629 | 1629 | ||
1630 | xhci_debug_trb(xhci, xhci->event_ring->dequeue); | ||
1631 | switch (trb_comp_code) { | 1630 | switch (trb_comp_code) { |
1632 | case COMP_SUCCESS: | 1631 | case COMP_SUCCESS: |
1633 | if (event_trb == ep_ring->dequeue) { | 1632 | if (event_trb == ep_ring->dequeue) { |
@@ -2895,15 +2894,6 @@ int xhci_queue_bulk_tx(struct xhci_hcd *xhci, gfp_t mem_flags, | |||
2895 | } | 2894 | } |
2896 | /* FIXME: this doesn't deal with URB_ZERO_PACKET - need one more */ | 2895 | /* FIXME: this doesn't deal with URB_ZERO_PACKET - need one more */ |
2897 | 2896 | ||
2898 | if (!in_interrupt()) | ||
2899 | xhci_dbg(xhci, "ep %#x - urb len = %#x (%d), " | ||
2900 | "addr = %#llx, num_trbs = %d\n", | ||
2901 | urb->ep->desc.bEndpointAddress, | ||
2902 | urb->transfer_buffer_length, | ||
2903 | urb->transfer_buffer_length, | ||
2904 | (unsigned long long)urb->transfer_dma, | ||
2905 | num_trbs); | ||
2906 | |||
2907 | ret = prepare_transfer(xhci, xhci->devs[slot_id], | 2897 | ret = prepare_transfer(xhci, xhci->devs[slot_id], |
2908 | ep_index, urb->stream_id, | 2898 | ep_index, urb->stream_id, |
2909 | num_trbs, urb, 0, false, mem_flags); | 2899 | num_trbs, urb, 0, false, mem_flags); |
@@ -3024,9 +3014,6 @@ int xhci_queue_ctrl_tx(struct xhci_hcd *xhci, gfp_t mem_flags, | |||
3024 | if (!urb->setup_packet) | 3014 | if (!urb->setup_packet) |
3025 | return -EINVAL; | 3015 | return -EINVAL; |
3026 | 3016 | ||
3027 | if (!in_interrupt()) | ||
3028 | xhci_dbg(xhci, "Queueing ctrl tx for slot id %d, ep %d\n", | ||
3029 | slot_id, ep_index); | ||
3030 | /* 1 TRB for setup, 1 for status */ | 3017 | /* 1 TRB for setup, 1 for status */ |
3031 | num_trbs = 2; | 3018 | num_trbs = 2; |
3032 | /* | 3019 | /* |
@@ -3218,15 +3205,6 @@ static int xhci_queue_isoc_tx(struct xhci_hcd *xhci, gfp_t mem_flags, | |||
3218 | return -EINVAL; | 3205 | return -EINVAL; |
3219 | } | 3206 | } |
3220 | 3207 | ||
3221 | if (!in_interrupt()) | ||
3222 | xhci_dbg(xhci, "ep %#x - urb len = %#x (%d)," | ||
3223 | " addr = %#llx, num_tds = %d\n", | ||
3224 | urb->ep->desc.bEndpointAddress, | ||
3225 | urb->transfer_buffer_length, | ||
3226 | urb->transfer_buffer_length, | ||
3227 | (unsigned long long)urb->transfer_dma, | ||
3228 | num_tds); | ||
3229 | |||
3230 | start_addr = (u64) urb->transfer_dma; | 3208 | start_addr = (u64) urb->transfer_dma; |
3231 | start_trb = &ep_ring->enqueue->generic; | 3209 | start_trb = &ep_ring->enqueue->generic; |
3232 | start_cycle = ep_ring->cycle_state; | 3210 | start_cycle = ep_ring->cycle_state; |