lkml.org 
[lkml]   [2018]   [Feb]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Date
    Subject[PATCH 3.2 059/140] usbip: stub: stop printing kernel pointer addresses in messages
    3.2.100-rc1 review patch.  If anyone has any objections, please let me know.

    ------------------

    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>
    [bwh: Backported to 3.2:
    - Drop change in stub_complete()
    - Adjust filenames, context]
    Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
    ---
    drivers/staging/usbip/stub_main.c | 5 +++--
    drivers/staging/usbip/stub_rx.c | 7 ++-----
    drivers/staging/usbip/stub_tx.c | 6 +++---
    3 files changed, 8 insertions(+), 10 deletions(-)

    --- a/drivers/staging/usbip/stub_main.c
    +++ b/drivers/staging/usbip/stub_main.c
    @@ -227,11 +227,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/staging/usbip/stub_rx.c
    +++ b/drivers/staging/usbip/stub_rx.c
    @@ -239,9 +239,6 @@ static int stub_recv_cmd_unlink(struct s
    if (priv->seqnum == pdu->u.cmd_unlink.seqnum) {
    int ret;

    - 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
    @@ -280,8 +277,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/staging/usbip/stub_tx.c
    +++ b/drivers/staging/usbip/stub_tx.c
    @@ -201,8 +201,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_dump_header(pdu_header);*/
    usbip_header_correct_endian(&pdu_header, 1);

    \
     
     \ /
      Last update: 2018-02-28 16:43    [W:4.104 / U:0.076 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site