From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755968AbbAaVfE (ORCPT ); Sat, 31 Jan 2015 16:35:04 -0500 Received: from mout.web.de ([212.227.15.3]:60546 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753580AbbAaVfB (ORCPT ); Sat, 31 Jan 2015 16:35:01 -0500 Message-ID: <54CD4A7D.8000802@users.sourceforge.net> Date: Sat, 31 Jan 2015 22:34:53 +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: "David S. Miller" , Paul Moore , netdev@vger.kernel.org CC: LKML , kernel-janitors@vger.kernel.org, Julia Lawall Subject: [PATCH 1/3] netlabel: Deletion of an unnecessary check before the function call "cipso_v4_doi_putdef" 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> <54CD45B6.6010703@users.sourceforge.net> In-Reply-To: <54CD45B6.6010703@users.sourceforge.net> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit X-Provags-ID: V03:K0:/0ao21jdoPTosbQHWkICe5lcsZzSPA0xlAX/mBkVYtxCodEdFqM bvwzmjpONA8godWQYutjCRwEt9YyAHfpY/9mGMv9CZ5Txm/Km1tbtmXUZ9fy4hTd0ghdRRK NphPqWevWCiTDuBrKC5gkU/xsV2Uvna+1a40hIWPDB9Hc5UjMcDqvXjP2HwUsjYG3F3iWSU 2zHXglJyOE5rqayO+HyGQ== 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: Sat, 31 Jan 2015 19:09:50 +0100 The cipso_v4_doi_putdef() 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 --- net/netlabel/netlabel_mgmt.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/net/netlabel/netlabel_mgmt.c b/net/netlabel/netlabel_mgmt.c index 8b3b789..f5807f5 100644 --- a/net/netlabel/netlabel_mgmt.c +++ b/net/netlabel/netlabel_mgmt.c @@ -242,8 +242,7 @@ static int netlbl_mgmt_add_common(struct genl_info *info, return 0; add_failure: - if (cipsov4) - cipso_v4_doi_putdef(cipsov4); + cipso_v4_doi_putdef(cipsov4); if (entry) kfree(entry->domain); kfree(addrmap); -- 2.2.2