From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753329AbaKCSlC (ORCPT ); Mon, 3 Nov 2014 13:41:02 -0500 Received: from mout.web.de ([212.227.17.11]:58773 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751908AbaKCSk5 (ORCPT ); Mon, 3 Nov 2014 13:40:57 -0500 Message-ID: <5457CC33.4050906@users.sourceforge.net> Date: Mon, 03 Nov 2014 19:40:51 +0100 From: SF Markus Elfring User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.2.0 MIME-Version: 1.0 To: "Yann E. MORIN" , linux-kbuild@vger.kernel.org CC: linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org, trivial@kernel.org, Coccinelle Subject: [PATCH v2] kconfig: Deletion of unnecessary checks before the function call "sym_calc_value" 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> <54568924.5010008@users.sourceforge.net> In-Reply-To: <54568924.5010008@users.sourceforge.net> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit X-Provags-ID: V03:K0:27Q0biP67eP/oA4RCNV1g1dHghemruYzNzskSxKkil6YBl64DrU ys7aZsNRBBtUgKkKGTvk1MoNlavVE7vpVf+XiVAEO6tV2eJ7HOsdqQkHsdT9/C5ebay/scY qCLpSRTvpj/WjjCx7RUpYlL2gtleX52ZFhxJVr18qSExA7zVHfLqinJM1TnCtE0UdjWJJov 2zEYz72JR46O+peTYo+FQ== 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 The sym_calc_value() 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 Acked-by: Paul Bolle --- scripts/kconfig/confdata.c | 6 ++---- scripts/kconfig/symbol.c | 3 +-- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/scripts/kconfig/confdata.c b/scripts/kconfig/confdata.c index f88d90f..3073cb6 100644 --- a/scripts/kconfig/confdata.c +++ b/scripts/kconfig/confdata.c @@ -262,8 +262,7 @@ int conf_read_simple(const char *name, int def) goto load; sym_add_change_count(1); if (!sym_defconfig_list) { - if (modules_sym) - sym_calc_value(modules_sym); + sym_calc_value(modules_sym); return 1; } @@ -399,8 +398,7 @@ setsym: free(line); fclose(in); - if (modules_sym) - sym_calc_value(modules_sym); + sym_calc_value(modules_sym); return 0; } diff --git a/scripts/kconfig/symbol.c b/scripts/kconfig/symbol.c index 7caabdb..3f7797b 100644 --- a/scripts/kconfig/symbol.c +++ b/scripts/kconfig/symbol.c @@ -447,8 +447,7 @@ void sym_clear_all_valid(void) for_all_symbols(i, sym) sym->flags &= ~SYMBOL_VALID; sym_add_change_count(1); - if (modules_sym) - sym_calc_value(modules_sym); + sym_calc_value(modules_sym); } void sym_set_changed(struct symbol *sym) -- 2.1.3