diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-09-22 19:54:53 (GMT) |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-09-22 20:01:40 (GMT) |
commit | ae19ffbadc1b2100285a5b5b3d0a4e0a11390904 (patch) | |
tree | 3c2086ab67398a019089a47ca3f362a4bc6db74f /drivers/staging/usbip/vhci_tx.c | |
parent | 34e84f39a27d059a3e6ec6e8b94aafa702e6f220 (diff) | |
parent | 9173a8ef24a6b1b8031507b35b8ffe5f85a87692 (diff) | |
download | linux-fsl-qoriq-ae19ffbadc1b2100285a5b5b3d0a4e0a11390904.tar.xz |
Merge branch 'master' into for-linus
Diffstat (limited to 'drivers/staging/usbip/vhci_tx.c')
-rw-r--r-- | drivers/staging/usbip/vhci_tx.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/drivers/staging/usbip/vhci_tx.c b/drivers/staging/usbip/vhci_tx.c index 1f552a9..7a00eb4 100644 --- a/drivers/staging/usbip/vhci_tx.c +++ b/drivers/staging/usbip/vhci_tx.c @@ -26,7 +26,7 @@ static void setup_cmd_submit_pdu(struct usbip_header *pdup, struct urb *urb) struct vhci_priv *priv = ((struct vhci_priv *)urb->hcpriv); struct vhci_device *vdev = priv->vdev; - dbg_vhci_tx("URB, local devnum %u, remote devid %u\n", + usbip_dbg_vhci_tx("URB, local devnum %u, remote devid %u\n", usb_pipedevice(urb->pipe), vdev->devid); pdup->base.command = USBIP_CMD_SUBMIT; @@ -85,7 +85,7 @@ static int vhci_send_cmd_submit(struct vhci_device *vdev) memset(&msg, 0, sizeof(msg)); memset(&iov, 0, sizeof(iov)); - dbg_vhci_tx("setup txdata urb %p\n", urb); + usbip_dbg_vhci_tx("setup txdata urb %p\n", urb); /* 1. setup usbip_header */ @@ -121,15 +121,15 @@ static int vhci_send_cmd_submit(struct vhci_device *vdev) ret = kernel_sendmsg(vdev->ud.tcp_socket, &msg, iov, 3, txsize); if (ret != txsize) { - uerr("sendmsg failed!, retval %d for %zd\n", ret, - txsize); + usbip_uerr("sendmsg failed!, retval %d for %zd\n", ret, + txsize); kfree(iso_buffer); usbip_event_add(&vdev->ud, VDEV_EVENT_ERROR_TCP); return -1; } kfree(iso_buffer); - dbg_vhci_tx("send txdata\n"); + usbip_dbg_vhci_tx("send txdata\n"); total_size += txsize; } @@ -177,7 +177,7 @@ static int vhci_send_cmd_unlink(struct vhci_device *vdev) memset(&msg, 0, sizeof(msg)); memset(&iov, 0, sizeof(iov)); - dbg_vhci_tx("setup cmd unlink, %lu \n", unlink->seqnum); + usbip_dbg_vhci_tx("setup cmd unlink, %lu \n", unlink->seqnum); /* 1. setup usbip_header */ @@ -195,14 +195,14 @@ static int vhci_send_cmd_unlink(struct vhci_device *vdev) ret = kernel_sendmsg(vdev->ud.tcp_socket, &msg, iov, 1, txsize); if (ret != txsize) { - uerr("sendmsg failed!, retval %d for %zd\n", ret, - txsize); + usbip_uerr("sendmsg failed!, retval %d for %zd\n", ret, + txsize); usbip_event_add(&vdev->ud, VDEV_EVENT_ERROR_TCP); return -1; } - dbg_vhci_tx("send txdata\n"); + usbip_dbg_vhci_tx("send txdata\n"); total_size += txsize; } @@ -220,7 +220,7 @@ void vhci_tx_loop(struct usbip_task *ut) while (1) { if (signal_pending(current)) { - uinfo("vhci_tx signal catched\n"); + usbip_uinfo("vhci_tx signal catched\n"); break; } @@ -234,6 +234,6 @@ void vhci_tx_loop(struct usbip_task *ut) (!list_empty(&vdev->priv_tx) || !list_empty(&vdev->unlink_tx))); - dbg_vhci_tx("pending urbs ?, now wake up\n"); + usbip_dbg_vhci_tx("pending urbs ?, now wake up\n"); } } |