Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933934AbdCWKmR (ORCPT ); Thu, 23 Mar 2017 06:42:17 -0400 Received: from userp1040.oracle.com ([156.151.31.81]:51481 "EHLO userp1040.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932206AbdCWKmP (ORCPT ); Thu, 23 Mar 2017 06:42:15 -0400 Date: Thu, 23 Mar 2017 13:41:42 +0300 From: Dan Carpenter To: Boaz Harrosh Cc: Benny Halevy , "James E.J. Bottomley" , "Martin K. Petersen" , osd-dev@open-osd.org, linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org Subject: [PATCH] scsi: osd_uld: remove an unneeded NULL check Message-ID: <20170323104142.GD20154@mwanda> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.6.0 (2016-04-01) X-Source-IP: aserv0021.oracle.com [141.146.126.233] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 948 Lines: 24 We don't call the remove() function unless probe() succeeds so "oud" can't be NULL here. Plus, if it were NULL, we dereference it on the next line so it would crash anyway. Signed-off-by: Dan Carpenter diff --git a/drivers/scsi/osd/osd_uld.c b/drivers/scsi/osd/osd_uld.c index 4101c3178411..8b9941a5687a 100644 --- a/drivers/scsi/osd/osd_uld.c +++ b/drivers/scsi/osd/osd_uld.c @@ -507,10 +507,9 @@ static int osd_remove(struct device *dev) struct scsi_device *scsi_device = to_scsi_device(dev); struct osd_uld_device *oud = dev_get_drvdata(dev); - if (!oud || (oud->od.scsi_device != scsi_device)) { - OSD_ERR("Half cooked osd-device %p,%p || %p!=%p", - dev, oud, oud ? oud->od.scsi_device : NULL, - scsi_device); + if (oud->od.scsi_device != scsi_device) { + OSD_ERR("Half cooked osd-device %p, || %p!=%p", + dev, oud->od.scsi_device, scsi_device); } cdev_device_del(&oud->cdev, &oud->class_dev);