From:   John Garry <john.g.garry@oracle.com>
To:     jejb@linux.ibm.com, martin.petersen@oracle.com
Cc:     linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org,
        dgilbert@interlog.com, John Garry <john.g.garry@oracle.com>
Subject: [PATCH 06/11] scsi: scsi_debug: Drop scsi_debug_bus_reset() NULL pointer checks
Date:   Tue,  7 Mar 2023 10:55:50 +0000
Message-Id: <20230307105555.3745277-7-john.g.garry@oracle.com>
In-Reply-To: <20230307105555.3745277-1-john.g.garry@oracle.com>
References: <20230307105555.3745277-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?2rfJ84pMD2TL8PHbJg1F/ky1Tnj/xXclgAIp0v6+t5Auh13406VLiA0hTyFM?=
 =?us-ascii?Q?jQPdOL/xlzAjRr8E7vhP6ndri4iMdpmpLErca8x++8z3T/tT4xzG8UkfzEgO?=
 =?us-ascii?Q?cWNkksTy1+jeW2ziWIMfX2odZ88oDYXSrIOfvCkyI6NuAoS5aUv7t40WAFWX?=
 =?us-ascii?Q?u+mOXSg37o+dATvDpWzLiuMTPQTgdLHCONYBUSm+gErbDg1AbSps+LcowSka?=
 =?us-ascii?Q?yKV3lEBSafKlmDc7STsc4TXqKpJdZ4/PC+gUjeoqRWCs74aYzWlaJ3zAywXz?=
 =?us-ascii?Q?S3C2NJJQTwTuAPOtT7flY0KSQEgcPP4iH4ZNbmKakJYVLwt5fmpVTXUPiTMb?=
 =?us-ascii?Q?jR58fHPfUg5Gr84bCnY03qaa1yS3tPQPLwxiltmuUI4WQw/Ze8j5x3DiWF03?=
 =?us-ascii?Q?+fL8tTGGAR60zs6AFJnjJ0xc7zwYaZBsrCDj71BfNNKItxSMmxjMcj8PPEii?=
 =?us-ascii?Q?C3LgU04tlGdUJmXRoV1ohVPbSIiXwXLd0PKMDmG6xf5BWDHeQCmyZ309eBnt?=
 =?us-ascii?Q?mB5C/CsoHjVIFw8A/PGGiEDcUf1yKBCT1IdEMinqTTYNZL3jfialjX8U7N0E?=
 =?us-ascii?Q?hbG9032lBaowc+CGHpX7rE6Egp/bv0eUXsapo0JwRLi4BKSGV47laYQTrC67?=
 =?us-ascii?Q?cMOMNgrxx5RvYjc/I6WweNus1VPnw36bVG9uSMxqd+VCCJEywfOmTuRWDm8b?=
 =?us-ascii?Q?bUQqBger1MRlmUeA7QIhgSYpZtwXmMIplhj6oUS1ndD6PlFsDSwe4Zhr36ma?=
 =?us-ascii?Q?r/UhTGfJo9flX7dx5VJ85xwY3dIW/74GKugSoIBiER0qtbLdq8/KN/HL1dbi?=
 =?us-ascii?Q?g4lIfCuCzDzJXgcgiFOUCx8T0UUCtPrhtC+AnZ2SXDtEkdV0ZdHDVLNJch7k?=
 =?us-ascii?Q?0/yI2jQ1RhrzkyayyBu5jdHv1uA8Q+tOszhTJ2ygqBqBDyDZaU84ImeTPCfI?=
 =?us-ascii?Q?Rcp/6Y1V5iiHpZ2JAXC7DpfJkycnomRfA85W0SV8QDRiTUrDtibzgwlHhif0?=
 =?us-ascii?Q?weufRnDmZlEvjUvenE353hC3iJ80/H0es4sGF7NPkcHxpjZKn/t2j2F1/MtM?=
 =?us-ascii?Q?y8lIg94L2m7fD5JSD9/KA5z1zUKi94ztB4AWFQ7YDTZDR1I7fxsNuDPixkAI?=
 =?us-ascii?Q?rCg/X0kX885Ad93qsrCvxumhTd7fVa/pvIAm2cgWKDUc6tSKZwxB2r4DIQWF?=
 =?us-ascii?Q?V3g2lY0guph6QyJpPjuLhHHP9NZD+U6gqbI06V+miLhry4k6sr9wn+njUXlm?=
 =?us-ascii?Q?sxmWJWonKKpxNxlXq4+ArR4Jnlk1Axmuz2Hx1t8XVf2tKnHRaePPbJYjSU82?=
 =?us-ascii?Q?aL3W+pwcEoXpt3fm2T6sbivMwfb7IOm9k3LCToHvPfjf+rRMzn7trFeIyIqA?=
 =?us-ascii?Q?iymHPI4acc5sUtde198b4F0rS+7Xr4J+WwPF0sTyWAG+Cjd5QIzfSfE3Jtwk?=
 =?us-ascii?Q?l6ZLQUEkfj6eTjoYyLN4Nt7Wx35lBjruxH4mzu57i/kKI6jsmdciYZgpPEQC?=
 =?us-ascii?Q?Xui0shULrPB+mZO4W7TjH7bo6EGWUcMkkszHC588IsK4umYZhwzBFA7YR3P+?=
 =?us-ascii?Q?tf5+Aeu6uRg4s4O0SFA3qxIP9QefogieycZ8L00HyG1bEXk+gBDZqwjbgxBL?=
 =?us-ascii?Q?bw=3D=3D?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: 8fxxMc9UqSLCCSpfh3wN5PfhKlYy0kriPZEwYVkDu8JLRr3ML5TNbDA31+YDYA41WBLfjMqv/okgW9l/UauvJuZIMiU6o/i25G7Eu5r5QZ1IfHD1qCeMSrqAHSqN2a4w4wRPejgqcqf3tFueqeBwoCVWq9fDbW3IE33RmcVfeaD8C5zvjzKlxOTN0h2Bo1vHY1T/vbuPk+DGgmdUpPc5sfuLEr5Toz3IoOh5fFao6cWPekG5YB6nKyVIpyv2TkChMAHpX9VSeT5s/VzrLvH8pKpkUvPZyRnGz1diocXDVk+u0fUB0JxWjsxCBYu+t9FHncjIvzekY0T7Ir1VxUIizOnhsyqGDJVaC1Sx2TBgknD03J+UkrDb1q0dI9K1OkdzY7Se7PdiNWpIq8cXHSriXGherot3fA+CZ01urVwDLz/J69ohqJslkOAfWaZFV9NXdL1o+nxZZ+fhtk+kFZyOJ096ZFsr85qeEjaAE1NzQlrIf5+N968GaFIUhzsufpdXgqMe5LcvFdXNT9qS2o+OMYZy9qVXgE5pJnjxnPFjFNUGPdxDuvp7YCTwEdZTnxb0iQwc7FraUBgFLPGNW6Ng3lhXoR8vLQwRY0KowSIWdKpJckt8VT1DehJ3KueopBmvBVpMLJj9Bz2T6sUJZ6cJBBJ/n4kOLrxtjERo+HXFCOGZXC44luoUGdtw0FrtJx7E+EAnSqiWLP5zmJDRZGnXukr/kcXVkY34voRp4uIqXID1ZnfphYpYMQF60u+quweYRReaYRadRBFZHC7XQD2XoMKtXQNOJrpGoix4ueuWgW1+ddRY8cJHk/fwPLL2JmSbQ/pnKNI9dTBdZiIPY8uBjQ==
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: c989a234-4253-4e30-36cf-08db1efaa29c
X-MS-Exchange-CrossTenant-AuthSource: DM6PR10MB4313.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Mar 2023 10:56:42.2798
 (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: x2/NurEuMIpNLvy6CNFoAvbiX03w27R/ISQ4unVgCvqGB0WOy8ukQcxSmeU5Wp152itTC0EN2Lk+J5UlEAJ5yA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR10MB6719
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.219,Aquarius:18.0.942,Hydra:6.0.573,FMLib:17.11.170.22
 definitions=2023-03-07_05,2023-03-07_01,2023-02-09_01
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 malwarescore=0 suspectscore=0
 bulkscore=0 phishscore=0 spamscore=0 mlxlogscore=999 mlxscore=0
 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1
 engine=8.12.0-2212070000 definitions=main-2303070098
X-Proofpoint-GUID: lCCvkKfJjQG_Ld-IGWIX0G0pgGJGzGbL
X-Proofpoint-ORIG-GUID: lCCvkKfJjQG_Ld-IGWIX0G0pgGJGzGbL
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, 9 insertions(+), 17 deletions(-)

diff --git a/drivers/scsi/scsi_debug.c b/drivers/scsi/scsi_debug.c
index 33c0df6a3275..6f1dbd8dc37f 100644
--- a/drivers/scsi/scsi_debug.c
+++ b/drivers/scsi/scsi_debug.c
@@ -5418,32 +5418,24 @@ static int scsi_debug_bus_reset(struct scsi_cmnd *SCpnt)
 {
 	struct sdebug_host_info *sdbg_host;
 	struct sdebug_dev_info *devip;
-	struct scsi_device *sdp;
-	struct Scsi_Host *hp;
+	struct scsi_device *sdp = SCpnt->device;
 	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 = to_sdebug_host_from_shost(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;
-			}
-		}
+
+	sdbg_host = to_sdebug_host_from_shost(sdp->host);
+
+	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