From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753395AbbGIIDC (ORCPT ); Thu, 9 Jul 2015 04:03:02 -0400 Received: from mout.web.de ([212.227.17.12]:59647 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752956AbbGIIA2 (ORCPT ); Thu, 9 Jul 2015 04:00:28 -0400 Subject: [PATCH] cdrom: Delete an unnecessary check before unregister_sysctl_table() 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> To: Jens Axboe , LKML Cc: kernel-janitors@vger.kernel.org, Julia Lawall From: SF Markus Elfring Message-ID: <559E2A11.60105@users.sourceforge.net> Date: Thu, 9 Jul 2015 10:00:17 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.0.1 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:ZRmsA6YiFVRYa8R6Wjhg4Ffueo8P1ABSFfrXY07HcIMLbFCb8Db bxThfrRjrApNALb4p4RzhTV2Apxq2IXQaD3lKVDnbrepKe9UDSA2iKuLYsZxNNXToXY+U85 vTccohvofNy6AapPM6PBpni/fzN5OfIYF1nsRr82MXfP/F+LuJH20YbNEHHrYfjT20OjUY7 fjScUyMVbXiEnBHSanlqQ== X-UI-Out-Filterresults: notjunk:1;V01:K0:WckEXqCE1EI=:qJGYPxYUMz1pkTZBoj4iXK 7oZHNIMOJIcrmGa71PZVU/l3APeEIabm1MbIuR549IlZrq0x29MO8+Tlbqd+/Sw6w89IoOvu0 x3UZz2jVGRoKEQ3WKjO2zRuoNsWKXxTb7nXB8Ww+5pX3i+zH+2EdkjSrCY4azWqtXzfFPusTA P5hjw7nTPovqwkA54LfoEXiBpDeTb1zPA7KHeDhay87jiUzXpEp2vIu0ay7phes2IQmusr10c CAFasiZfveniVaS/+Bzaz5Pmq9wDAnm23+IT7AXoW6/+FjkyHTrth0HPQ5mTIXdt1axa1M9Yq ok+UiLGQDZWfQDQzju/YnbI8MfTVFYSmhcbbq/kvl0D1aBfxdK1K8bRzl3SftPCc638jIBzhH JZQng+uPMctVEJBPXuhSyva9aujgebx9GczAIpJu38aZhwaXB7P8StRpB8xCI9MGFQEMJlMnu /9hgDla5Q5n86v7soqMW/EAfp0TGbvEO7+jnyhghUcCd02gjgsM6FvXvjAC990XsavOPfdhY3 nTeK8qwrAnUi2JWR77N+i3A8vYEK7RQce8DERDOebg/KhOc8pLdc0FUefonoTCM26sLsRbC2+ NDyms/HigJx1gVYKyqVc2Y1cfVIxA/uCdQyax2WfwvhD7C/A9vuEvqxfJQQyhhL1fHFGPKP35 d1W2xy7VbeZjygn+tR/D/4+1h/DBE5JM6yOwBJyG0Zpp7RY6AFFyB1PCA/Zz7PK+mB34= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring Date: Thu, 9 Jul 2015 09:52:24 +0200 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/cdrom/cdrom.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/cdrom/cdrom.c b/drivers/cdrom/cdrom.c index 5d28a45..e43e84d 100644 --- a/drivers/cdrom/cdrom.c +++ b/drivers/cdrom/cdrom.c @@ -3698,8 +3698,7 @@ static void cdrom_sysctl_register(void) static void cdrom_sysctl_unregister(void) { - if (cdrom_sysctl_header) - unregister_sysctl_table(cdrom_sysctl_header); + unregister_sysctl_table(cdrom_sysctl_header); } #else /* CONFIG_SYSCTL */ -- 2.4.5