From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from mout.web.de ([212.227.15.3]:62160 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751181AbcGQUQj (ORCPT ); Sun, 17 Jul 2016 16:16:39 -0400 Subject: [PATCH] [media] tw686x-kh: Delete an unnecessary check before the function call "video_unregister_device" To: linux-media@vger.kernel.org, devel@driverdev.osuosl.org, Mauro Carvalho Chehab , =?UTF-8?Q?Krzysztof_Ha=c5=82asa?= , Hans Verkuil , Greg Kroah-Hartman References: <5307CAA2.8060406@users.sourceforge.net> <530A086E.8010901@users.sourceforge.net> <530A72AA.3000601@users.sourceforge.net> <530B5FB6.6010207@users.sourceforge.net> <530C5E18.1020800@users.sourceforge.net> <530CD2C4.4050903@users.sourceforge.net> <530CF8FF.8080600@users.sourceforge.net> <530DD06F.4090703@users.sourceforge.net> <5317A59D.4@users.sourceforge.net> From: SF Markus Elfring Cc: LKML , kernel-janitors@vger.kernel.org, Julia Lawall Message-ID: <289fc09c-8ccb-c3a9-e740-af06687e7121@users.sourceforge.net> Date: Sun, 17 Jul 2016 22:16:19 +0200 MIME-Version: 1.0 In-Reply-To: <5317A59D.4@users.sourceforge.net> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit Sender: linux-media-owner@vger.kernel.org List-ID: From: Markus Elfring Date: Sun, 17 Jul 2016 22:00:35 +0200 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 --- drivers/staging/media/tw686x-kh/tw686x-kh-video.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/staging/media/tw686x-kh/tw686x-kh-video.c b/drivers/staging/media/tw686x-kh/tw686x-kh-video.c index 6ecb504..3f2830c 100644 --- a/drivers/staging/media/tw686x-kh/tw686x-kh-video.c +++ b/drivers/staging/media/tw686x-kh/tw686x-kh-video.c @@ -643,8 +643,7 @@ void tw686x_kh_video_free(struct tw686x_dev *dev) struct tw686x_video_channel *vc = &dev->video_channels[ch]; v4l2_ctrl_handler_free(&vc->ctrl_handler); - if (vc->device) - video_unregister_device(vc->device); + video_unregister_device(vc->device); vb2_dma_sg_cleanup_ctx(vc->alloc_ctx); for (n = 0; n < 2; n++) { struct dma_desc *descs = &vc->sg_tables[n]; -- 2.9.1