From:   John Garry <john.g.garry@oracle.com>
To:     jejb@linux.ibm.com, martin.petersen@oracle.com
Cc:     linux-scsi@vger.kernel.org, bvanassche@acm.org,
        linux-kernel@vger.kernel.org, dgilbert@interlog.com,
        John Garry <john.g.garry@oracle.com>
Subject: [PATCH RESEND v2 06/11] scsi: scsi_debug: Drop scsi_debug_bus_reset() NULL pointer checks
Date:   Mon, 13 Mar 2023 09:31:09 +0000
Message-Id: <20230313093114.1498305-7-john.g.garry@oracle.com>
In-Reply-To: <20230313093114.1498305-1-john.g.garry@oracle.com>
References: <20230313093114.1498305-1-john.g.garry@oracle.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?wxLWKQh04cPyV6uP85lj41mNKBJDVtaGBaKrmZ7gbppM7lwQTq6j8yYJciSS?=
 =?us-ascii?Q?OMjuFaaBSJbmk9jKh4R4JC9MsJafhBicv1JrDrZY+LRhrqcQziBXeYIBKScV?=
 =?us-ascii?Q?2TahHj6sa16bjAG8eeP3204G2Y84qM1Say+VSbMEkXuiXb8xPUNLP9JdXnRN?=
 =?us-ascii?Q?sFNllucEe5iQ770e/zSDvv+NKrzEa7QYsNgTMdiB01F/7/lmcIHYLTYJH7MV?=
 =?us-ascii?Q?zjaP1XzUG+PlFR6i0IiTNt5PpWk0AQaoiyatDObdtREz2U6ZuUXbeK64QGhp?=
 =?us-ascii?Q?1SfJSxUL7b/Qg4ey+zg6agYgBoRgL3dcbJFJT4NrsjQ8RQ+exVbMvO+WQrUF?=
 =?us-ascii?Q?sJePo69JfzGkqE8oT0OkISHv0GPwHEh/hKneEhzrSq7zbjTaFmxzm93F1KyG?=
 =?us-ascii?Q?RK6TAiphZCt3vmvmgJ4aJKf2ZdKrYlC2LE2cEx+n+oNCva5ZQRlQgR0jZd8K?=
 =?us-ascii?Q?54J6zoKMni6ZyH8V4geEKJRtgOhV5IyYa7g85IT09R/qSUy99qRaC0rtl+ny?=
 =?us-ascii?Q?GpDo4Tb0q6XxbkbE0i6AXgldC4BZOC3tOzSTAvlgaoZGxNoF1GYwMHZ6Gbi1?=
 =?us-ascii?Q?P+dZUp4SeT3W+hDGKbwMiaOkCm5yDUE2OSrv4Y9Yg40CNVNd96y8Axbyk6Gp?=
 =?us-ascii?Q?f2zAdU+4AnltqElthpHk+qPhd5zn9wUnpJweNCYYtmj19NfPveB9UCPMRLbT?=
 =?us-ascii?Q?8hjzipB262AHqhmT+zcuVBH02ip0HR2s+M9yoBi2fU8Eb++pJHSdTpBacZK9?=
 =?us-ascii?Q?aY2iiBMs1N4Va+TXfmdqHYvpRqdBvXsfNDXgXMt1lzBWMpz2+FbUN+R/dRHs?=
 =?us-ascii?Q?1lLrKdcjn9KChe1XbrSDRDmbvEa3w/3hLsT04ArO8IvNxTvn9dd2uj9ehRWb?=
 =?us-ascii?Q?W/Nhr1KowmETTRiKI1N6Y6I5O/vMQelvkR8r7vsD17nNUzm4VZqaKceSzUjX?=
 =?us-ascii?Q?+AMfhWS3HTIBWRTUF2nr0S6rifVLDXw95x9AmwCpSJmo10qXRJcq//r6C5I/?=
 =?us-ascii?Q?V413DJ2BShav5VgLDZO8Xc2TP9CDk3Uwx9mnx74qMU6j5nWOQZNiidoI0KoP?=
 =?us-ascii?Q?YB9NLCGSRnAQJMaTgVC+hdxRcr6lJSZ87usb+O/4t6ovAe3mc4nk/V9PNA5x?=
 =?us-ascii?Q?cJjdsSnzruNhlpdhFKL9B0Hv9oZHdfUMx89AvUhat3v6cdESq23+DZ0Qogg5?=
 =?us-ascii?Q?48ZypiaiXS/DUtfVMUtAjYbUvfL5rnB8oRXmucfEDUggd+n7N5Ukrl7CLUiY?=
 =?us-ascii?Q?D10eImYt7jtQimEDRGLVYd5VIKCGNXrk+JhVkTGKPAl4oK27dzRWd4Rx9HmV?=
 =?us-ascii?Q?huPh6ZH/M/p11V10o8sSxAorpP7QSVEDcKNeRQ+igAJzR9SRYTGmsfuA8Qwo?=
 =?us-ascii?Q?1d0eUZT5SKmMYdZfkznPMmLcGXMxtJG+ZBPx2FbbJegb4eHQ1xHdPC4de4gx?=
 =?us-ascii?Q?k59zMW/1AbTBsGGLKUASMbWVXKxV+exf/t8IsUBRjaX/Emg+Hx0Fy/S023ru?=
 =?us-ascii?Q?GbuL6ci3/nslDibGNk4VB5D7dIds3chEOwHRTlApNXz2RTMdaCtVPA6eRVu3?=
 =?us-ascii?Q?PExBBZKlHVckKhvtZ7nA7ZMX9mBou5hhtuR+EAO0r24g90lxaGH8d7ZOGTUw?=
 =?us-ascii?Q?hg=3D=3D?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: GDTGhSgekD7rqvOIZ6Fez2kQs+ZjD23x911WlAmttX6R9L61oIQ3aaI/X62cn+2AhP2kgXGx89RWJ26Ay/JLWkx3WsYypJayCwksIevNzH2I+tFL9vLMJLPSbpTa0+oBuBxDeUoZ/I3/gDEXoMoCI9rUln8Kuef95bar354V/T4gbRoEuFEB+iuzd6G3yEyGoTerKR8KKzkv37jXcC8966qOd9Qzo91xXxMY/ZPR5nPXm4Zq45kwOFTUVyVB68yw5MpJ1qfhr8mCiPM/cXbF/BtDhSMtDuazoJqV894OVArvIRTqXFnrABwr0z8DkqQJQ5gQ5OKphZ0MGbsAWz30YZqRU7WaivYrczAKXQgYe3d2xW2eg6zQa+UunBNGnmVbflIpodOxbRcwKZ7Bpg3AbR455xYlHH0hjggwvzkdGvub6tC9aK6i3PJrPdz5IIjQvW572HVCX7Rgx8p5u7/pB0jFqSW6Y/Sv1hBu3+A21AG3yTgAHRMzTRM3ZCl5sZu+PqhldqKbQJRsC8pd63BTiHkFxOHqBH509OJmHgHkal5mywBdtb8Y0Ibg+X6jr1EcwDzQHstM+rw9t9Mfn4nhI2sWMcKz2o3ET9EbuuYfdBvnB4R6SoiBD6yuAqUOLlzlSAZ64H0EiublRDuENpfwXItCgZeB2KJuemm/qDQ1nez9/Cq3IgZ/UkMgYsvv8dmPpayypCKWIrdaLm7No4MtiurayQFsIPR/y+HsR0W4HaZuuXsP6dWTKcQUdVC2soAjknv51DcApLbU1o5EW12FtjRaQjhhAbkkMQouswEy3fRoyfaAsdD47kMEB7YBDNt2MLVAZ5ricKbrqYCUyrpchFV3kzuIYjzrKAiLsA8ehFE=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 4c6a2bef-ec0c-4e9a-2bd4-08db23a5c18b
X-MS-Exchange-CrossTenant-AuthSource: DM6PR10MB4313.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Mar 2023 09:31:42.8787
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: n+MLO1AFzrfMsG3UhYXs2NDKwtP0jispD0kQLMcI/o+aAY2A15R1tWGfaFF6mz0Eu9m8OoJohFxthfN0fzY+bA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN7PR10MB7048
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.254,Aquarius:18.0.942,Hydra:6.0.573,FMLib:17.11.170.22
 definitions=2023-03-13_02,2023-03-10_01,2023-02-09_01
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxlogscore=999 mlxscore=0 phishscore=0
 spamscore=0 suspectscore=0 malwarescore=0 adultscore=0 bulkscore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2212070000
 definitions=main-2303130077
X-Proofpoint-ORIG-GUID: st3tDyEGrkd01cLSeN3prXjwU80P8rk-
X-Proofpoint-GUID: st3tDyEGrkd01cLSeN3prXjwU80P8rk-
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

The checks for SCSI cmnd, SCSI device, and SCSI host are unnecessary, so
drop them. Likewise, drop the NULL check for sdbg_host.

The only caller is scsi_try_bus_reset() -> eh_bus_reset_handler(),
and there those pointers cannot be NULL.

Signed-off-by: John Garry <john.g.garry@oracle.com>
---
 drivers/scsi/scsi_debug.c | 26 ++++++++------------------
 1 file changed, 8 insertions(+), 18 deletions(-)

diff --git a/drivers/scsi/scsi_debug.c b/drivers/scsi/scsi_debug.c
index 6364d6f08861..749358b48335 100644
--- a/drivers/scsi/scsi_debug.c
+++ b/drivers/scsi/scsi_debug.c
@@ -5412,34 +5412,24 @@ static int scsi_debug_target_reset(struct scsi_cmnd *SCpnt)
 
 static int scsi_debug_bus_reset(struct scsi_cmnd *SCpnt)
 {
-	struct sdebug_host_info *sdbg_host;
+	struct scsi_device *sdp = SCpnt->device;
+	struct sdebug_host_info *sdbg_host = shost_to_sdebug_host(sdp->host);
 	struct sdebug_dev_info *devip;
-	struct scsi_device *sdp;
-	struct Scsi_Host *hp;
 	int k = 0;
 
 	++num_bus_resets;
-	if (!(SCpnt && SCpnt->device))
-		goto lie;
-	sdp = SCpnt->device;
+
 	if (SDEBUG_OPT_ALL_NOISE & sdebug_opts)
 		sdev_printk(KERN_INFO, sdp, "%s\n", __func__);
-	hp = sdp->host;
-	if (hp) {
-		sdbg_host = shost_to_sdebug_host(hp);
-		if (sdbg_host) {
-			list_for_each_entry(devip,
-					    &sdbg_host->dev_info_list,
-					    dev_list) {
-				set_bit(SDEBUG_UA_BUS_RESET, devip->uas_bm);
-				++k;
-			}
-		}
+
+	list_for_each_entry(devip, &sdbg_host->dev_info_list, dev_list) {
+		set_bit(SDEBUG_UA_BUS_RESET, devip->uas_bm);
+		++k;
 	}
+
 	if (SDEBUG_OPT_RESET_NOISE & sdebug_opts)
 		sdev_printk(KERN_INFO, sdp,
 			    "%s: %d device(s) found in host\n", __func__, k);
-lie:
 	return SUCCESS;
 }
 
-- 
2.35.3