| From 248a22044366f588d46754c54dfe29ffe4f8b4df Mon Sep 17 00:00:00 2001 |
| From: Shuah Khan <shuahkh@osg.samsung.com> |
| Date: Mon, 18 Dec 2017 17:23:37 -0700 |
| Subject: usbip: stub: stop printing kernel pointer addresses in messages |
| |
| From: Shuah Khan <shuahkh@osg.samsung.com> |
| |
| commit 248a22044366f588d46754c54dfe29ffe4f8b4df 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> |
| |
| --- |
| drivers/usb/usbip/stub_main.c | 5 +++-- |
| drivers/usb/usbip/stub_rx.c | 7 ++----- |
| drivers/usb/usbip/stub_tx.c | 6 +++--- |
| 3 files changed, 8 insertions(+), 10 deletions(-) |
| |
| --- a/drivers/usb/usbip/stub_main.c |
| +++ b/drivers/usb/usbip/stub_main.c |
| @@ -252,11 +252,12 @@ void stub_device_cleanup_urbs(struct stu |
| struct stub_priv *priv; |
| struct urb *urb; |
| |
| - dev_dbg(&sdev->udev->dev, "free sdev %p\n", sdev); |
| + dev_dbg(&sdev->udev->dev, "Stub device cleaning up urbs\n"); |
| |
| while ((priv = stub_priv_pop(sdev))) { |
| urb = priv->urb; |
| - dev_dbg(&sdev->udev->dev, "free urb %p\n", urb); |
| + dev_dbg(&sdev->udev->dev, "free urb seqnum %lu\n", |
| + priv->seqnum); |
| usb_kill_urb(urb); |
| |
| kmem_cache_free(stub_priv_cache, priv); |
| --- a/drivers/usb/usbip/stub_rx.c |
| +++ b/drivers/usb/usbip/stub_rx.c |
| @@ -225,9 +225,6 @@ static int stub_recv_cmd_unlink(struct s |
| if (priv->seqnum != pdu->u.cmd_unlink.seqnum) |
| continue; |
| |
| - dev_info(&priv->urb->dev->dev, "unlink urb %p\n", |
| - priv->urb); |
| - |
| /* |
| * This matched urb is not completed yet (i.e., be in |
| * flight in usb hcd hardware/driver). Now we are |
| @@ -266,8 +263,8 @@ static int stub_recv_cmd_unlink(struct s |
| ret = usb_unlink_urb(priv->urb); |
| if (ret != -EINPROGRESS) |
| dev_err(&priv->urb->dev->dev, |
| - "failed to unlink a urb %p, ret %d\n", |
| - priv->urb, ret); |
| + "failed to unlink a urb # %lu, ret %d\n", |
| + priv->seqnum, ret); |
| |
| return 0; |
| } |
| --- a/drivers/usb/usbip/stub_tx.c |
| +++ b/drivers/usb/usbip/stub_tx.c |
| @@ -102,7 +102,7 @@ void stub_complete(struct urb *urb) |
| /* link a urb to the queue of tx. */ |
| spin_lock_irqsave(&sdev->priv_lock, flags); |
| if (sdev->ud.tcp_socket == NULL) { |
| - usbip_dbg_stub_tx("ignore urb for closed connection %p", urb); |
| + usbip_dbg_stub_tx("ignore urb for closed connection\n"); |
| /* It will be freed in stub_device_cleanup_urbs(). */ |
| } else if (priv->unlinking) { |
| stub_enqueue_ret_unlink(sdev, priv->seqnum, urb->status); |
| @@ -204,8 +204,8 @@ static int stub_send_ret_submit(struct s |
| |
| /* 1. setup usbip_header */ |
| setup_ret_submit_pdu(&pdu_header, urb); |
| - usbip_dbg_stub_tx("setup txdata seqnum: %d urb: %p\n", |
| - pdu_header.base.seqnum, urb); |
| + usbip_dbg_stub_tx("setup txdata seqnum: %d\n", |
| + pdu_header.base.seqnum); |
| usbip_header_correct_endian(&pdu_header, 1); |
| |
| iov[iovnum].iov_base = &pdu_header; |