From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S966479AbbBCQW4 (ORCPT ); Tue, 3 Feb 2015 11:22:56 -0500 Received: from mout.web.de ([212.227.17.11]:62428 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S966458AbbBCQWx (ORCPT ); Tue, 3 Feb 2015 11:22:53 -0500 Message-ID: <54D0F5B6.7010608@users.sourceforge.net> Date: Tue, 03 Feb 2015 17:22:14 +0100 From: SF Markus Elfring User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.4.0 MIME-Version: 1.0 To: Mauro Carvalho Chehab , linux-media@vger.kernel.org CC: LKML , kernel-janitors@vger.kernel.org, Julia Lawall Subject: [PATCH 1/2] [media] DVB: Delete an unnecessary check before the function call "dvb_unregister_device" 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> <54D0F4F3.1040405@users.sourceforge.net> In-Reply-To: <54D0F4F3.1040405@users.sourceforge.net> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit X-Provags-ID: V03:K0:9ybsAgepQKhwUCGyXmHzFaKlmrUW8N87Mg5u0sarDVedm5koS9b LuNvBwuoBAov3pNc6hEYKFRdkxutPj+nArj1lm4WPl8haurpBqkhDpTjaRyKLe0lwzyg4LJ OonGLV3bEmWodBg7ln2b4ATf3E/F5rAZlqLHVCQ+5erNgYKoAtd3VpeVndFFnPheSh4PLlx YwQTZMDnFCk9j2Dmdh1xQ== X-UI-Out-Filterresults: notjunk:1; Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring Date: Tue, 3 Feb 2015 16:01:40 +0100 The dvb_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/media/dvb-core/dvb_ca_en50221.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/media/dvb-core/dvb_ca_en50221.c b/drivers/media/dvb-core/dvb_ca_en50221.c index 0aac309..b999689 100644 --- a/drivers/media/dvb-core/dvb_ca_en50221.c +++ b/drivers/media/dvb-core/dvb_ca_en50221.c @@ -1726,8 +1726,7 @@ int dvb_ca_en50221_init(struct dvb_adapter *dvb_adapter, error: if (ca != NULL) { - if (ca->dvbdev != NULL) - dvb_unregister_device(ca->dvbdev); + dvb_unregister_device(ca->dvbdev); kfree(ca->slot_info); kfree(ca); } -- 2.2.2