diff options
author | Frederic Weisbecker | 2009-10-18 01:09:09 +0200 |
---|---|---|
committer | Frederic Weisbecker | 2009-10-18 01:12:33 +0200 |
commit | 0f8f86c7bdd1c954fbe153af437a0d91a6c5721a (patch) | |
tree | 94a8d419a470a4f9852ca397bb9bbe48db92ff5c /drivers/staging/usbip/vhci_tx.c | |
parent | Merge branch 'linus' into tracing/hw-breakpoints (diff) | |
parent | perf tools: Move dereference after NULL test (diff) | |
download | kernel-qcow2-linux-0f8f86c7bdd1c954fbe153af437a0d91a6c5721a.tar.gz kernel-qcow2-linux-0f8f86c7bdd1c954fbe153af437a0d91a6c5721a.tar.xz kernel-qcow2-linux-0f8f86c7bdd1c954fbe153af437a0d91a6c5721a.zip |
Merge commit 'perf/core' into perf/hw-breakpoint
Conflicts:
kernel/Makefile
kernel/trace/Makefile
kernel/trace/trace.h
samples/Makefile
Merge reason: We need to be uptodate with the perf events development
branch because we plan to rewrite the breakpoints API on top of
perf events.
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 1f552a95f486..7a00eb44b795 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"); } } |