From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752213AbbAROiE (ORCPT ); Sun, 18 Jan 2015 09:38:04 -0500 Received: from mout.web.de ([212.227.17.12]:52980 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751238AbbAROiB (ORCPT ); Sun, 18 Jan 2015 09:38:01 -0500 Message-ID: <54BBC536.5010006@users.sourceforge.net> Date: Sun, 18 Jan 2015 15:37:42 +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: Don Brace , iss_storagedev@hp.com, storagedev@pmcs.com, linux-scsi@vger.kernel.org CC: LKML , kernel-janitors@vger.kernel.org, Julia Lawall Subject: [PATCH 1/3] block-cciss: Deletion of an unnecessary check before the function call "put_disk" 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> <54BBC3AB.6040207@users.sourceforge.net> In-Reply-To: <54BBC3AB.6040207@users.sourceforge.net> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit X-Provags-ID: V03:K0:xHK73F8xYGjcBCV3oGg/BpL97EKEWKxTp+e9wdSjqgkxd4yXKXJ t+raote9YyJlrX1LP79iAqr8qNi5XI/L/HfFVQ1LUe0NN5V3LaEcPBoqAzcBGOOcYEdjh1B TiQPlDIlKslLCiuuLrnp7T26NjBdqZFq+IAQT6lksT3DnZfHBu+TVlnq8L3+rQT3zblHTSY llGuOcyTpzpfOvC0Wzztw== 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: Sun, 18 Jan 2015 11:14:16 +0100 The put_disk() 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/block/cciss.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c index ff20f19..4be0de0 100644 --- a/drivers/block/cciss.c +++ b/drivers/block/cciss.c @@ -4424,8 +4424,7 @@ static void free_hba(ctlr_info_t *h) hba[h->ctlr] = NULL; for (i = 0; i < h->highest_lun + 1; i++) - if (h->gendisk[i] != NULL) - put_disk(h->gendisk[i]); + put_disk(h->gendisk[i]); kfree(h); } -- 2.2.2