lkml.org 
[lkml]   [2014]   [Nov]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH 1/1] [media] USB: Deletion of unnecessary checks before three function calls
    From: Markus Elfring <elfring@users.sourceforge.net>
    Date: Thu, 20 Nov 2014 13:26:36 +0100

    The functions pvr2_hdw_destroy(), rc_unregister_device() and vfree() perform
    also input parameter validation. Thus the test around the call is not needed.

    This issue was detected by using the Coccinelle software.

    Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
    ---
    drivers/media/usb/au0828/au0828-input.c | 3 +--
    drivers/media/usb/em28xx/em28xx-input.c | 3 +--
    drivers/media/usb/pvrusb2/pvrusb2-context.c | 2 +-
    drivers/media/usb/s2255/s2255drv.c | 3 +--
    4 files changed, 4 insertions(+), 7 deletions(-)

    diff --git a/drivers/media/usb/au0828/au0828-input.c b/drivers/media/usb/au0828/au0828-input.c
    index fd0d3a90..3357141 100644
    --- a/drivers/media/usb/au0828/au0828-input.c
    +++ b/drivers/media/usb/au0828/au0828-input.c
    @@ -353,8 +353,7 @@ void au0828_rc_unregister(struct au0828_dev *dev)
    if (!ir)
    return;

    - if (ir->rc)
    - rc_unregister_device(ir->rc);
    + rc_unregister_device(ir->rc);

    /* done */
    kfree(ir);
    diff --git a/drivers/media/usb/em28xx/em28xx-input.c b/drivers/media/usb/em28xx/em28xx-input.c
    index ed843bd..67a22f4 100644
    --- a/drivers/media/usb/em28xx/em28xx-input.c
    +++ b/drivers/media/usb/em28xx/em28xx-input.c
    @@ -838,8 +838,7 @@ static int em28xx_ir_fini(struct em28xx *dev)
    if (!ir)
    goto ref_put;

    - if (ir->rc)
    - rc_unregister_device(ir->rc);
    + rc_unregister_device(ir->rc);

    /* done */
    kfree(ir);
    diff --git a/drivers/media/usb/pvrusb2/pvrusb2-context.c b/drivers/media/usb/pvrusb2/pvrusb2-context.c
    index 7c19ff7..c8761c7 100644
    --- a/drivers/media/usb/pvrusb2/pvrusb2-context.c
    +++ b/drivers/media/usb/pvrusb2/pvrusb2-context.c
    @@ -80,7 +80,7 @@ static void pvr2_context_set_notify(struct pvr2_context *mp, int fl)
    static void pvr2_context_destroy(struct pvr2_context *mp)
    {
    pvr2_trace(PVR2_TRACE_CTXT,"pvr2_context %p (destroy)",mp);
    - if (mp->hdw) pvr2_hdw_destroy(mp->hdw);
    + pvr2_hdw_destroy(mp->hdw);
    pvr2_context_set_notify(mp, 0);
    mutex_lock(&pvr2_context_mutex);
    if (mp->exist_next) {
    diff --git a/drivers/media/usb/s2255/s2255drv.c b/drivers/media/usb/s2255/s2255drv.c
    index 2c90186..3cab886 100644
    --- a/drivers/media/usb/s2255/s2255drv.c
    +++ b/drivers/media/usb/s2255/s2255drv.c
    @@ -1976,8 +1976,7 @@ static int s2255_release_sys_buffers(struct s2255_vc *vc)
    {
    unsigned long i;
    for (i = 0; i < SYS_FRAMES; i++) {
    - if (vc->buffer.frame[i].lpvbits)
    - vfree(vc->buffer.frame[i].lpvbits);
    + vfree(vc->buffer.frame[i].lpvbits);
    vc->buffer.frame[i].lpvbits = NULL;
    }
    return 0;
    --
    2.1.3


    \
     
     \ /
      Last update: 2014-11-20 14:01    [W:4.020 / U:0.116 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site