usbip: vhci: stop printing kernel pointer addresses in messages

[pandora-kernel.git] / drivers / staging / usbip / vhci_rx.c

diff --git a/drivers/staging/usbip/vhci_rx.c b/drivers/staging/usbip/vhci_rx.c
index 3872b8c..3b008e6 100644 (file)
--- a/drivers/staging/usbip/vhci_rx.c
+++ b/drivers/staging/usbip/vhci_rx.c
@@ -35,21 +35,19 @@ struct urb *pickup_urb_and_free_priv(struct vhci_device *vdev, __u32 seqnum)
                        urb = priv->urb;
                        status = urb->status;
 
-                       usbip_dbg_vhci_rx("find urb %p vurb %p seqnum %u\n",
-                                         urb, priv, seqnum);
+                       usbip_dbg_vhci_rx("find urb seqnum %u\n", seqnum);
 
                        /* TODO: fix logic here to improve indent situtation */
                        if (status != -EINPROGRESS) {
                                if (status == -ENOENT ||
                                    status == -ECONNRESET)
-                                       dev_info(&urb->dev->dev,
-                                                "urb %p was unlinked "
-                                                "%ssynchronuously.\n", urb,
-                                                status == -ENOENT ? "" : "a");
+                                       dev_dbg(&urb->dev->dev,
+                                               "urb seq# %u was unlinked %ssynchronuously\n",
+                                               seqnum, status == -ENOENT ? "" : "a");
                                else
-                                       dev_info(&urb->dev->dev,
-                                                "urb %p may be in a error, "
-                                                "status %d\n", urb, status);
+                                       dev_dbg(&urb->dev->dev,
+                                               "urb seq# %u may be in a error, status %d\n",
+                                               seqnum, status);
                        }
 
                        list_del(&priv->list);
@@ -75,8 +73,8 @@ static void vhci_recv_ret_submit(struct vhci_device *vdev,
        spin_unlock(&vdev->priv_lock);
 
        if (!urb) {
-               pr_err("cannot find a urb of seqnum %u\n", pdu->base.seqnum);
-               pr_info("max seqnum %d\n",
+               pr_err("cannot find a urb of seqnum %u max seqnum %d\n",
+                       pdu->base.seqnum,
                        atomic_read(&the_controller->seqnum));
                usbip_event_add(ud, VDEV_EVENT_ERROR_TCP);
                return;
@@ -94,13 +92,12 @@ static void vhci_recv_ret_submit(struct vhci_device *vdev,
                return;
 
        /* restore the padding in iso packets */
-       if (usbip_pad_iso(ud, urb) < 0)
-               return;
+       usbip_pad_iso(ud, urb);
 
        if (usbip_dbg_flag_vhci_rx)
                usbip_dump_urb(urb);
 
-       usbip_dbg_vhci_rx("now giveback urb %p\n", urb);
+       usbip_dbg_vhci_rx("now giveback urb %u\n", pdu->base.seqnum);
 
        spin_lock_irqsave(&the_controller->lock, flags);
        usb_hcd_unlink_urb_from_ep(vhci_to_hcd(the_controller), urb);
@@ -166,7 +163,7 @@ static void vhci_recv_ret_unlink(struct vhci_device *vdev,
                pr_info("the urb (seqnum %d) was already given backed\n",
                        pdu->base.seqnum);
        } else {
-               usbip_dbg_vhci_rx("now giveback urb %p\n", urb);
+               usbip_dbg_vhci_rx("now giveback urb %d\n", pdu->base.seqnum);
 
                /* If unlink is succeed, status is -ECONNRESET */
                urb->status = pdu->u.ret_unlink.status;
@@ -206,7 +203,7 @@ static void vhci_rx_pdu(struct usbip_device *ud)
        memset(&pdu, 0, sizeof(pdu));
 
        /* 1. receive a pdu header */
-       ret = usbip_xmit(0, ud->tcp_socket, (char *) &pdu, sizeof(pdu), 0);
+       ret = usbip_recv(ud->tcp_socket, &pdu, sizeof(pdu));
        if (ret < 0) {
                if (ret == -ECONNRESET)
                        pr_info("connection reset by peer\n");