lkml.org 
[lkml]   [2018]   [May]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Date
    Subject[PATCH 3.2 120/153] USB: usbmon: remove assignment from IS_ERR argument
    3.2.102-rc1 review patch.  If anyone has any objections, please let me know.

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

    From: Julia Lawall <Julia.Lawall@lip6.fr>

    commit 46c236dc7d1212d7417e6fb0317f91c44c719322 upstream.

    The semantic patch that makes this change is as follows:
    (http://coccinelle.lip6.fr/)

    // <smpl>
    @@
    expression e1,e2;
    statement S1,S2;
    @@

    +e1 = e2;
    if (IS_ERR(
    e1
    - = e2
    )) S1 else S2
    // </smpl>

    Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
    ---
    drivers/usb/mon/mon_text.c | 6 ++++--
    1 file changed, 4 insertions(+), 2 deletions(-)

    --- a/drivers/usb/mon/mon_text.c
    +++ b/drivers/usb/mon/mon_text.c
    @@ -386,7 +386,8 @@ static ssize_t mon_text_read_t(struct fi
    struct mon_event_text *ep;
    struct mon_text_ptr ptr;

    - if (IS_ERR(ep = mon_text_read_wait(rp, file)))
    + ep = mon_text_read_wait(rp, file);
    + if (IS_ERR(ep))
    return PTR_ERR(ep);
    mutex_lock(&rp->printf_lock);
    ptr.cnt = 0;
    @@ -413,7 +414,8 @@ static ssize_t mon_text_read_u(struct fi
    struct mon_event_text *ep;
    struct mon_text_ptr ptr;

    - if (IS_ERR(ep = mon_text_read_wait(rp, file)))
    + ep = mon_text_read_wait(rp, file);
    + if (IS_ERR(ep))
    return PTR_ERR(ep);
    mutex_lock(&rp->printf_lock);
    ptr.cnt = 0;
    \
     
     \ /
      Last update: 2018-05-30 13:35    [W:2.229 / U:0.004 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site