From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1033023AbbKFJPn (ORCPT ); Fri, 6 Nov 2015 04:15:43 -0500 Received: from mout.web.de ([212.227.15.4]:57150 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1030698AbbKFJPj (ORCPT ); Fri, 6 Nov 2015 04:15:39 -0500 Subject: [PATCH] SGI-XPC: Delete unnecessary checks before unregister_sysctl_table() To: linux-kernel@vger.kernel.org, Cliff Whickman , Robin Holt 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> Cc: kernel-janitors@vger.kernel.org, Julia Lawall From: SF Markus Elfring Message-ID: <563C6FAE.3060606@users.sourceforge.net> Date: Fri, 6 Nov 2015 10:15:26 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.3.0 MIME-Version: 1.0 In-Reply-To: <5317A59D.4@users.sourceforge.net> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit X-Provags-ID: V03:K0:mAhkFcfCPebX0VnDMXOf9Sxq5ceBdifg913OqOWhvpaqd7gS5Dx RZO84eAYIirRcJw5jnaVSFEyz8FONaBlr1707xuDpLBcfXDKk2Z6KobYcLh1nVI2hfu+0Je A8fT96b8lEILf/WAFDOJ/mBItZ4jxuf0iOkuI24bBGIBdUNSszkmTYZuXSFRbpF+NKspBAT eM6r6bYASvRiakrWvoM9A== X-UI-Out-Filterresults: notjunk:1;V01:K0:wNkMMEvGo3s=:kpgcPC5miLAiDIlSZjZy0h Nt/Plkega3nRJTmlg5gu5iDNe0SfOBYglbQ3gn5Rh4rFewvf02GsuXlOwvwEsbN0wE8/cSaa9 Fr8Pm3JteZrrLjNjqR9Tvhju2IQEvzMqAVMA3ZeIEjRiV3SK87U5rJ0/S9VUE/JtvvsGC2HnM BhkQxGyGErOJO778mgvjIergh+F0G656WvuOo89ayjag8dG0KYgfiYOi1bUJhQjMgxUjETGmk wITSt7DjUsC/sA14KC46vgVXVqTHtAOoVaO5VUD2M0ofn0M3qhb/GAoLgSygmpUmDPQrjYiY+ FS1UR2zL66XxirluCRqqEX34T6kX3LlvvNHOLJ5HCp88M2XxYOtQ85/SDlpeZQQYQzlREBuXX S0XU7rJ+mj3M4APV25rJBzpJj4Izn8wkSYKPTzYGvqnyw4YZFM4bmbl2gsEdJBabyMgzceI2K WkyUvgpMe26hRLnDfuDgbDNggE1Vrl3weVKZYPFKeTpj+dp33cw6uVz+H/MPxKXc90HfX3g5s 2mLv3pjYXWb+TKuDBfSwgafWuthOAvBceSdYXtkehgk+Wp/nbp4t7sPY6EBBx87x3l2pJu+/k VJdHczHOhlWaYg2dTiTwt+MzwJwAtm/ODe7Epf73/Yv+XUGo5cJnBUiHzLKlyx/bJPuWDL3go YXFIdVf7wHEw7cHvusPAYj+6N1OM5zfzmySCr/wwJ0Q9d1DtUFtU0liMMlnJCMbIpIw5WAcPm YknrdcfkTZP2wss4IIZ0jQ0ers0dQY8WU8zHEBNLhEE/jaA80AoWno/PUR80Wg44rpXpFq9Rx OesIFJZ Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring Date: Fri, 6 Nov 2015 10:08:46 +0100 The unregister_sysctl_table() 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/misc/sgi-xp/xpc_main.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/drivers/misc/sgi-xp/xpc_main.c b/drivers/misc/sgi-xp/xpc_main.c index 7f32712..8d4fcac 100644 --- a/drivers/misc/sgi-xp/xpc_main.c +++ b/drivers/misc/sgi-xp/xpc_main.c @@ -1046,9 +1046,7 @@ xpc_do_exit(enum xp_retval reason) /* clear the interface to XPC's functions */ xpc_clear_interface(); - if (xpc_sysctl) - unregister_sysctl_table(xpc_sysctl); - + unregister_sysctl_table(xpc_sysctl); xpc_teardown_partitions(); if (is_shub()) @@ -1331,9 +1329,7 @@ out_3: (void)unregister_die_notifier(&xpc_die_notifier); (void)unregister_reboot_notifier(&xpc_reboot_notifier); out_2: - if (xpc_sysctl) - unregister_sysctl_table(xpc_sysctl); - + unregister_sysctl_table(xpc_sysctl); xpc_teardown_partitions(); out_1: if (is_shub()) -- 2.6.2