From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757069AbaKTRXm (ORCPT ); Thu, 20 Nov 2014 12:23:42 -0500 Received: from mout.web.de ([212.227.15.4]:64224 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751406AbaKTRXl (ORCPT ); Thu, 20 Nov 2014 12:23:41 -0500 Message-ID: <546E238A.5050606@users.sourceforge.net> Date: Thu, 20 Nov 2014 18:23:22 +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: Benny Halevy , Boaz Harrosh , "James E. J. Bottomley" , osd-dev@open-osd.org, linux-scsi@vger.kernel.org CC: LKML , kernel-janitors@vger.kernel.org, Julia Lawall Subject: [PATCH 1/1] SCSI-OSD: 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> In-Reply-To: <5317A59D.4@users.sourceforge.net> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit X-Provags-ID: V03:K0:SUaHXtg+qmMW82fFtpH9LsXTCjdkf60eMWtNjQAC/OZuwNNJUQU OKNA2lZ98Jj+2aSbw5496f9ctdnCoEdI7e2WMfLLsuyiXtcBR/rFR8I+i9444dggHMaCXf7 HEZQN33GJ7OiuxcsMwR5K77b7mjHUr5e0bMqfx4vDQrDKSp+a0ulP91EOljNIic1T+veyzM FhPq9TL52m3VpmZOZi6vQ== 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: Thu, 20 Nov 2014 18:11:28 +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/scsi/osd/osd_uld.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/scsi/osd/osd_uld.c b/drivers/scsi/osd/osd_uld.c index e1d9a4c..3d82ee1 100644 --- a/drivers/scsi/osd/osd_uld.c +++ b/drivers/scsi/osd/osd_uld.c @@ -408,8 +408,7 @@ static void __remove(struct device *dev) OSD_INFO("osd_remove %s\n", oud->disk ? oud->disk->disk_name : NULL); - if (oud->disk) - put_disk(oud->disk); + put_disk(oud->disk); ida_remove(&osd_minor_ida, oud->minor); kfree(oud); -- 2.1.3