usbip: vhci: stop printing kernel pointer addresses in messages

commit 8272d099d05f7ab2776cf56a2ab9f9443be18907 upstream.

Remove and/or change debug, info. and error messages to not print
kernel pointer addresses.

Signed-off-by: Shuah Khan <shuahkh@osg.samsung.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
[bwh: Backported to 3.2: adjust filenames, context, indentation]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>

diff --git a/drivers/staging/usbip/vhci_hcd.c b/drivers/staging/usbip/vhci_hcd.c
index 0bea1cb..c756250 100644 (file)
--- a/drivers/staging/usbip/vhci_hcd.c
+++ b/drivers/staging/usbip/vhci_hcd.c
@@ -516,9 +516,6 @@ static int vhci_urb_enqueue(struct usb_hcd *hcd, struct urb *urb,
        unsigned long flags;
        struct vhci_device *vdev;
 
        unsigned long flags;
        struct vhci_device *vdev;
 

-       usbip_dbg_vhci_hc("enter, usb_hcd %p urb %p mem_flags %d\n",
-                         hcd, urb, mem_flags);
-

        /* patch to usb_sg_init() is in 2.5.60 */
        BUG_ON(!urb->transfer_buffer && urb->transfer_buffer_length);
 
        /* patch to usb_sg_init() is in 2.5.60 */
        BUG_ON(!urb->transfer_buffer && urb->transfer_buffer_length);
 


@@ -677,8 +674,6 @@ static int vhci_urb_dequeue(struct usb_hcd *hcd, struct urb *urb, int status)
        struct vhci_priv *priv;
        struct vhci_device *vdev;
 
        struct vhci_priv *priv;
        struct vhci_device *vdev;
 

-       pr_info("dequeue a urb %p\n", urb);
-

        spin_lock_irqsave(&the_controller->lock, flags);
 
        priv = urb->hcpriv;
        spin_lock_irqsave(&the_controller->lock, flags);
 
        priv = urb->hcpriv;


@@ -707,7 +702,6 @@ static int vhci_urb_dequeue(struct usb_hcd *hcd, struct urb *urb, int status)
 
                spin_lock_irqsave(&vdev->priv_lock, flags2);
 
 
                spin_lock_irqsave(&vdev->priv_lock, flags2);
 

-               pr_info("device %p seems to be disconnected\n", vdev);

                list_del(&priv->list);
                kfree(priv);
                urb->hcpriv = NULL;
                list_del(&priv->list);
                kfree(priv);
                urb->hcpriv = NULL;


@@ -719,8 +713,6 @@ static int vhci_urb_dequeue(struct usb_hcd *hcd, struct urb *urb, int status)
                 * vhci_rx will receive RET_UNLINK and give back the URB.
                 * Otherwise, we give back it here.
                 */
                 * vhci_rx will receive RET_UNLINK and give back the URB.
                 * Otherwise, we give back it here.
                 */

-               pr_info("gives back urb %p\n", urb);
-

                usb_hcd_unlink_urb_from_ep(hcd, urb);
 
                spin_unlock_irqrestore(&the_controller->lock, flags);
                usb_hcd_unlink_urb_from_ep(hcd, urb);
 
                spin_unlock_irqrestore(&the_controller->lock, flags);


@@ -751,8 +743,6 @@ static int vhci_urb_dequeue(struct usb_hcd *hcd, struct urb *urb, int status)
 
                unlink->unlink_seqnum = priv->seqnum;
 
 
                unlink->unlink_seqnum = priv->seqnum;
 

-               pr_info("device %p seems to be still connected\n", vdev);
-

                /* send cmd_unlink and try to cancel the pending URB in the
                 * peer */
                list_add_tail(&unlink->list, &vdev->unlink_tx);
                /* send cmd_unlink and try to cancel the pending URB in the
                 * peer */
                list_add_tail(&unlink->list, &vdev->unlink_tx);

diff --git a/drivers/staging/usbip/vhci_rx.c b/drivers/staging/usbip/vhci_rx.c
index f5fba73..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;
 
                        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)
 
                        /* 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
                                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);
                        }
 
                        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) {
        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;
                        atomic_read(&the_controller->seqnum));
                usbip_event_add(ud, VDEV_EVENT_ERROR_TCP);
                return;


@@ -99,7 +97,7 @@ static void vhci_recv_ret_submit(struct vhci_device *vdev,
        if (usbip_dbg_flag_vhci_rx)
                usbip_dump_urb(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);
 
        spin_lock_irqsave(&the_controller->lock, flags);
        usb_hcd_unlink_urb_from_ep(vhci_to_hcd(the_controller), urb);


@@ -165,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 {
                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;
 
                /* If unlink is succeed, status is -ECONNRESET */
                urb->status = pdu->u.ret_unlink.status;

diff --git a/drivers/staging/usbip/vhci_tx.c b/drivers/staging/usbip/vhci_tx.c
index 9b437e7..d034261 100644 (file)
--- a/drivers/staging/usbip/vhci_tx.c
+++ b/drivers/staging/usbip/vhci_tx.c
@@ -83,7 +83,8 @@ static int vhci_send_cmd_submit(struct vhci_device *vdev)
                memset(&msg, 0, sizeof(msg));
                memset(&iov, 0, sizeof(iov));
 
                memset(&msg, 0, sizeof(msg));
                memset(&iov, 0, sizeof(iov));
 

-               usbip_dbg_vhci_tx("setup txdata urb %p\n", urb);
+               usbip_dbg_vhci_tx("setup txdata urb seqnum %lu\n",
+                                 priv->seqnum);

 
                /* 1. setup usbip_header */
                setup_cmd_submit_pdu(&pdu_header, urb);
 
                /* 1. setup usbip_header */
                setup_cmd_submit_pdu(&pdu_header, urb);