From: Markus Elfring Date: Tue, 3 Feb 2015 18:00:25 +0000 (-0300) Subject: [media] au0828: Delete unnecessary checks before the function call "video_unregister_... X-Git-Tag: v4.1-rc1~59^2~1^2~337 X-Git-Url: https://git.kernelconcepts.de/?a=commitdiff_plain;h=8aa9eb9059f6246b530d664f271e5c32858222ed;p=karo-tx-linux.git [media] au0828: Delete unnecessary checks before the function call "video_unregister_device" The video_unregister_device() function tests whether its argument is NULL and then returns immediately. Thus the test around the call is not needed. This issue was detected by using the Coccinelle software. Signed-off-by: Markus Elfring Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab --- diff --git a/drivers/media/usb/au0828/au0828-video.c b/drivers/media/usb/au0828/au0828-video.c index a27cb5fcdef8..b49fe9192559 100644 --- a/drivers/media/usb/au0828/au0828-video.c +++ b/drivers/media/usb/au0828/au0828-video.c @@ -899,12 +899,8 @@ void au0828_analog_unregister(struct au0828_dev *dev) { dprintk(1, "au0828_analog_unregister called\n"); mutex_lock(&au0828_sysfs_lock); - - if (dev->vdev) - video_unregister_device(dev->vdev); - if (dev->vbi_dev) - video_unregister_device(dev->vbi_dev); - + video_unregister_device(dev->vdev); + video_unregister_device(dev->vbi_dev); mutex_unlock(&au0828_sysfs_lock); }