diff options
author | Markus Elfring <elfring@users.sourceforge.net> | 2014-11-20 07:01:32 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2014-11-25 10:30:38 -0500 |
commit | 3dd94f00f07f013259dc221d6307ef699661f7ea (patch) | |
tree | 840040d130ddf93ad9604cf63c632f77c586c6d5 /drivers/media/rc | |
parent | 8f1aeedf78f5528a4471b019a39952aeb52dfa5b (diff) |
[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>
Diffstat (limited to 'drivers/media/rc')
-rw-r--r-- | drivers/media/rc/lirc_dev.c | 3 | ||||
-rw-r--r-- | 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 249d2fbc8f37..1e0545a67959 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) | |||
518 | 518 | ||
519 | WARN_ON(mutex_lock_killable(&lirc_dev_lock)); | 519 | WARN_ON(mutex_lock_killable(&lirc_dev_lock)); |
520 | 520 | ||
521 | if (ir->d.rdev) | 521 | rc_close(ir->d.rdev); |
522 | rc_close(ir->d.rdev); | ||
523 | 522 | ||
524 | ir->open--; | 523 | ir->open--; |
525 | if (ir->attached) { | 524 | if (ir->attached) { |
diff --git a/drivers/media/rc/rc-main.c b/drivers/media/rc/rc-main.c index 97dd6921edbe..86ffcd54339e 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) | |||
1298 | if (!dev) | 1298 | if (!dev) |
1299 | return; | 1299 | return; |
1300 | 1300 | ||
1301 | if (dev->input_dev) | 1301 | input_free_device(dev->input_dev); |
1302 | input_free_device(dev->input_dev); | ||
1303 | 1302 | ||
1304 | put_device(&dev->dev); | 1303 | put_device(&dev->dev); |
1305 | 1304 | ||