[media] rc: Deletion of unnecessary checks before two function calls

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>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>

diff --git a/drivers/media/rc/lirc_dev.c b/drivers/media/rc/lirc_dev.c
index 249d2fbc8f3748b69fa95ff39e783a458cb18a8f..1e0545a679599360f523c651a7fcddad7720862f 100644 (file)
--- 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 97dd6921edbe711ee5851a611eda54407d152457..86ffcd54339e14046de751cb833d062fada8073b 100644 (file)
--- 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);