aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorAndiry Xu <andiry.xu@amd.com>2010-12-20 04:12:24 -0500
committerSarah Sharp <sarah.a.sharp@linux.intel.com>2011-01-14 18:51:57 -0500
commitf2c565e223af39ed38be5c84b1a37b591b22db83 (patch)
treea8231ade4b22f47772713207504f846b117404c7 /drivers
parent50f7b52a83a893929edf87a89ebc081ff26a7b91 (diff)
xHCI: replace dev_dbg() with xhci_dbg()
dev_dbg() is used to print ordinary transfer messages in xhci-ring.c. System log messages will be flushed if CONFIG_USB_DEBUG is set. Replace the dev_dbg() with xhci_dbg(). Signed-off-by: Andiry Xu <andiry.xu@amd.com> Signed-off-by: Sarah Sharp <sarah.a.sharp@linux.intel.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/usb/host/xhci-ring.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/drivers/usb/host/xhci-ring.c b/drivers/usb/host/xhci-ring.c
index 1ee6de92193..e38f7ece0a6 100644
--- a/drivers/usb/host/xhci-ring.c
+++ b/drivers/usb/host/xhci-ring.c
@@ -1710,8 +1710,7 @@ static int process_bulk_intr_td(struct xhci_hcd *xhci, struct xhci_td *td,
1710 /* Others already handled above */ 1710 /* Others already handled above */
1711 break; 1711 break;
1712 } 1712 }
1713 dev_dbg(&td->urb->dev->dev, 1713 xhci_dbg(xhci, "ep %#x - asked for %d bytes, "
1714 "ep %#x - asked for %d bytes, "
1715 "%d bytes untransferred\n", 1714 "%d bytes untransferred\n",
1716 td->urb->ep->desc.bEndpointAddress, 1715 td->urb->ep->desc.bEndpointAddress,
1717 td->urb->transfer_buffer_length, 1716 td->urb->transfer_buffer_length,
@@ -2389,7 +2388,8 @@ static unsigned int count_sg_trbs_needed(struct xhci_hcd *xhci, struct urb *urb)
2389 } 2388 }
2390 xhci_dbg(xhci, "\n"); 2389 xhci_dbg(xhci, "\n");
2391 if (!in_interrupt()) 2390 if (!in_interrupt())
2392 dev_dbg(&urb->dev->dev, "ep %#x - urb len = %d, sglist used, num_trbs = %d\n", 2391 xhci_dbg(xhci, "ep %#x - urb len = %d, sglist used, "
2392 "num_trbs = %d\n",
2393 urb->ep->desc.bEndpointAddress, 2393 urb->ep->desc.bEndpointAddress,
2394 urb->transfer_buffer_length, 2394 urb->transfer_buffer_length,
2395 num_trbs); 2395 num_trbs);
@@ -2676,7 +2676,8 @@ int xhci_queue_bulk_tx(struct xhci_hcd *xhci, gfp_t mem_flags,
2676 /* FIXME: this doesn't deal with URB_ZERO_PACKET - need one more */ 2676 /* FIXME: this doesn't deal with URB_ZERO_PACKET - need one more */
2677 2677
2678 if (!in_interrupt()) 2678 if (!in_interrupt())
2679 dev_dbg(&urb->dev->dev, "ep %#x - urb len = %#x (%d), addr = %#llx, num_trbs = %d\n", 2679 xhci_dbg(xhci, "ep %#x - urb len = %#x (%d), "
2680 "addr = %#llx, num_trbs = %d\n",
2680 urb->ep->desc.bEndpointAddress, 2681 urb->ep->desc.bEndpointAddress,
2681 urb->transfer_buffer_length, 2682 urb->transfer_buffer_length,
2682 urb->transfer_buffer_length, 2683 urb->transfer_buffer_length,
@@ -2922,7 +2923,7 @@ static int xhci_queue_isoc_tx(struct xhci_hcd *xhci, gfp_t mem_flags,
2922 } 2923 }
2923 2924
2924 if (!in_interrupt()) 2925 if (!in_interrupt())
2925 dev_dbg(&urb->dev->dev, "ep %#x - urb len = %#x (%d)," 2926 xhci_dbg(xhci, "ep %#x - urb len = %#x (%d),"
2926 " addr = %#llx, num_tds = %d\n", 2927 " addr = %#llx, num_tds = %d\n",
2927 urb->ep->desc.bEndpointAddress, 2928 urb->ep->desc.bEndpointAddress,
2928 urb->transfer_buffer_length, 2929 urb->transfer_buffer_length,