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] rc: Deletion of unnecessary checks before two function calls
    From: Markus Elfring <elfring@users.sourceforge.net>
    Date: Thu, 20 Nov 2014 13:01:32 +0100

    The functions input_free_device() and rc_close() test whether their argument
    is NULL and then return immediately. 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/rc/lirc_dev.c | 3 +--
    drivers/media/rc/rc-main.c | 3 +--
    2 files changed, 2 insertions(+), 4 deletions(-)

    diff --git a/drivers/media/rc/lirc_dev.c b/drivers/media/rc/lirc_dev.c
    index dc5cbff..5c232e6 100644
    --- a/drivers/media/rc/lirc_dev.c
    +++ b/drivers/media/rc/lirc_dev.c
    @@ -518,8 +518,7 @@ int lirc_dev_fop_close(struct inode *inode, struct file *file)

    WARN_ON(mutex_lock_killable(&lirc_dev_lock));

    - if (ir->d.rdev)
    - rc_close(ir->d.rdev);
    + rc_close(ir->d.rdev);

    ir->open--;
    if (ir->attached) {
    diff --git a/drivers/media/rc/rc-main.c b/drivers/media/rc/rc-main.c
    index 8d3b74c..66df9fb 100644
    --- a/drivers/media/rc/rc-main.c
    +++ b/drivers/media/rc/rc-main.c
    @@ -1298,8 +1298,7 @@ void rc_free_device(struct rc_dev *dev)
    if (!dev)
    return;

    - if (dev->input_dev)
    - input_free_device(dev->input_dev);
    + input_free_device(dev->input_dev);

    put_device(&dev->dev);

    --
    2.1.3


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