From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752630AbbFXLqA (ORCPT ); Wed, 24 Jun 2015 07:46:00 -0400 Received: from mout.web.de ([212.227.15.14]:57933 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751699AbbFXLpu (ORCPT ); Wed, 24 Jun 2015 07:45:50 -0400 Message-ID: <558A9864.2020608@users.sourceforge.net> Date: Wed, 24 Jun 2015 13:45:40 +0200 From: SF Markus Elfring User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.7.0 MIME-Version: 1.0 To: Len Brown , Lv Zheng , "Rafael J. Wysocki" , Robert Moore , linux-acpi@vger.kernel.org, devel@acpica.org CC: LKML , kernel-janitors@vger.kernel.org, Julia Lawall Subject: [PATCH] ACPICA: Delete an unnecessary check before the function call "acpi_ds_delete_walk_state" 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> In-Reply-To: <5317A59D.4@users.sourceforge.net> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-Provags-ID: V03:K0:AFczeYXGpdf5HmJf0KEk/pp7XDqSWOUJsPQCEDFWr7kZF1sGYWS ZnVZhd0bOOaasGaCvdH4+hsD6QBVQmcsLDoiKoWaO+nYgYhA6sNTDWcNqxPynlN8O8yjjis UfA6JzboYBGzkF1fZWe1oq23f7AAk6+jyXkNoYmWHgh1xnL6vqZO5tQF003ibURka+vGZ41 l4jE9APazLuFYIRcBh9eQ== X-UI-Out-Filterresults: notjunk:1;V01:K0:jXY6AUfzq/o=:MsL8mWTnW2HEN5VGWbZtmi 4ykp+trdj+cMVfAHzbzU9vf3a7+qFTY/qzcsLGZ6sLQCRBDDUy/slkxT3Qx+warmHBdCSrNLO BOYv7Uxr+A/dLTDMLIWCNUE28elCIKotMeT7iXVv9zxGskWPHdQR13pvwMqGdSg0J2P6KM2+u cBxqvjwmXmvtTH1FR+iVM6yzMi73ocSqMrFUyvqheNSlA031yn3DwaXZdnWhwfjth+uII8zs7 0hUTiXycMcKButzR8cU5fAj2XwYUcfa2NBKF/lB8NZK8SxNSsMIHXKkltMQHoTze6DZqEOPpN ur5kL4gFRu9PT7J8d0ZWPYjT1eMPDeSiUSUxFusMHwXxuTKMa/oofiwzfJZiK7TbYYEME32f4 Rc+g3/BQZ2W4LxDrCwLrLkkOn1k4EPp17FINrLoBjOfICbeSPiy6gwSpytBzfrH0pjBtKuA0E D/sYFtrkpMM/9rsaT0WoIgs0r91+Cts/lyf7OLLkzJ6LGmUi9fWMUNSKWGJruKlE0VIN65f+g XwKIbE7gLxV8SumhYECQ3RXV+6hksDOSlBfo9GU8z9bKaf783ksi9QIFAJI24407WH+x1h7ha qd70GrhavLdAee5RYpN0+ZDLT3nPxIXT4TVZ1GG0HNvgg0MoxuLWKfIf13YgSlFy0lvE2ZSLW J1xIIHPZvuIDJ9i1Lsplq8gi4DWxrXRJIDv3gxaa/ld4UhhAXG8rUiMco6btpKIZX6D0= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring Date: Wed, 24 Jun 2015 13:33:47 +0200 The acpi_ds_delete_walk_state() 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/acpi/acpica/dsmethod.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/drivers/acpi/acpica/dsmethod.c b/drivers/acpi/acpica/dsmethod.c index 85bb951..188b254 100644 --- a/drivers/acpi/acpica/dsmethod.c +++ b/drivers/acpi/acpica/dsmethod.c @@ -574,10 +574,7 @@ cleanup: /* On error, we must terminate the method properly */ acpi_ds_terminate_control_method(obj_desc, next_walk_state); - if (next_walk_state) { - acpi_ds_delete_walk_state(next_walk_state); - } - + acpi_ds_delete_walk_state(next_walk_state); return_ACPI_STATUS(status); } -- 2.4.4