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 07/11] scsi: scsi_debug: Drop scsi_debug_host_reset() device NULL pointer check
Date:   Mon, 13 Mar 2023 09:31:10 +0000
Message-Id: <20230313093114.1498305-8-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?MHAe0pSjkfL25HxWv5SjmWlElu7nvta/dTiCqUm/xRY5vElGbFR/+DPi3qIh?=
 =?us-ascii?Q?1b5aFiBpmDM6MnptZ4TbACxwliR0rdJmV/OfV9kKjUDzS3BmxOE6EBstbita?=
 =?us-ascii?Q?+1/fKVHBU74mXsfCPYEWGDAyxY6UFoJuseTAlZjpzvVzO4LM0Zctck4KnSVf?=
 =?us-ascii?Q?6TJZGPvBJtD5TzjMV3tIARHcx86WcFNmmd1tV7Y4ht01quGbBtOMsdCXdYd2?=
 =?us-ascii?Q?eNWdDb0vYJnstx4LvTyGsL93u8KFgKAuOGIDyR8cJNovMhHrs8zcdZ25DirW?=
 =?us-ascii?Q?M2zCJbDF9J6z1f/ZETq1nREu9jDXC4d+6jdWkSAyunAOVI1RiR4+uH3jZiN8?=
 =?us-ascii?Q?UWfA9bpFjjmgTlOwVi568hPI2kLPeNo9sAX1BxGXo7SDwehEqF847KwXSeRd?=
 =?us-ascii?Q?UZjxD1JlB2GcwinlgL/PZfpTP7ildGbu3QCd3sjMZVtg2Ba+IUXsjak2ftyj?=
 =?us-ascii?Q?pvWT9fuYTtFDDsDeOJiauHJOz9OzKhNjMhiOIYeLCWqkLljMXHgLMDXrMUCv?=
 =?us-ascii?Q?qF/pad5PIALnuOsE1fxouFNDiWYtw8IEyK6jFNYrOg5eP1dpCWIJ7OxlEbuW?=
 =?us-ascii?Q?dySe2v30cj6fe6qi4sGZKVX8cWbRvJzLrpQ3owcl/eHIiz4uEAjUaEmZJnCc?=
 =?us-ascii?Q?1G5Q03PkaV3AQCV7ZEZY258I16UoD2KIc7xuRtlbbpSWeYTeOpdE47cYGPIs?=
 =?us-ascii?Q?wF9iawG7fI1aRF46LnGlAhsvtLSJ5zJeFWi0MtgSOB5bH75P/twfFTQzpX3E?=
 =?us-ascii?Q?kYEKaNZ5Ef256kYGSkFQ1d5IwPOUd25Gqhbzx6tU2sE4JtVabklhDVNeD4qX?=
 =?us-ascii?Q?W5VBL5EXEhF8XTOrf75LQbQ4G4ELq5MmHIsMUx2QzxNH5YrZWob0Y2FFj4pZ?=
 =?us-ascii?Q?dj4AaJjOykGk7BNlsNGxoUruIrXK5343ozQsH33z4vlm5GA5oz7KLkSy/cUN?=
 =?us-ascii?Q?hOzgoUBJs3l4EZ0nS38aZfO8K9Y+5UM2dErZJJN6hpMQqXcIwVg9lQ6ZkHVB?=
 =?us-ascii?Q?qI1EA6J48apC0SnRyxalOXBw9JZ+4xrtud1cfA6eF8g/05N8ZuwOyscSMBko?=
 =?us-ascii?Q?A6AzHFc22EMiimWGwLEVq1lnKzs06cZMQwAOtoxaAIYgGCvErYr3cvQx+ZlD?=
 =?us-ascii?Q?2KyYGlR09iFso45WN5q5zCXofVDI0rAKu3vv6R0G/rXBc0kPsKaNDds/UTyn?=
 =?us-ascii?Q?G0dQjMYFjrWuaju3ISvR7QtIEfqYDrZQEGj5KIjAm/gMtGfv2SKJ437a0Ivt?=
 =?us-ascii?Q?pk/KCrF/u7ErU4lq6RlQTYq5rvPtqOTazshzzrbxxygyuFXM/rF9pPIjYncm?=
 =?us-ascii?Q?LF3J3+g9KGhQWMTPC6GyqjVd545JthTtITSlXxlb3YODmdy/HpX4o4UIEXxI?=
 =?us-ascii?Q?X/KMfmS545u9Js/T3ueRa5B4qGhW35suSgSrUE05PrWWnBegNOGUxoH8Jqa/?=
 =?us-ascii?Q?mkF3Hg7jjEafwg1+wqz9rZc7j47QLW38mdz/m2/Ju5WZZ27z5dxMqpksIWHG?=
 =?us-ascii?Q?C82bio0nQtnkHdKhucD+1pRqiUbhtHc5gbzEtKb50eOv6Lcb2AgP5H3BFRKi?=
 =?us-ascii?Q?xZmBNUnum2WeK1/0zmEdP61xCNUDeML/hP/IwICPHLjf59x8UFk0QxZGF9O9?=
 =?us-ascii?Q?GA=3D=3D?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: EitnohmxqzyCSGELNlNeM3B0i8/Eo+OZload++aiUfErtEsgI1xPeU1jCr0NV5m6CDba/MOXJD4ILqhGdWIqvXpM8ZguYjIfj5oPO65/abty/MNcaDwTf8ZTyIfEyAjy59xWoWCp5b1iCvEnwG3wOoKTvQplg6N9sulBHKKTF/pMCW8LNBXoPVLfgES1wAVYQ64sMqRoF/aMb/eJeqB6fj6CbKW/mj/EFQPzJ8Vico/lhe4SxLxMlF9ynJ3prOKhz9+H+mmIdrzuM0KisfbyBWLtZLpPs3zazscpR/+aFdYzmEpuWyJu7GYw3xLJ3uNvbAmHDp40gi3ISnZL9NkMY4Tbi+2yYOtsY3B5lev/16gekunh4CRJzT2vg1k8JFeV86Y9W9I6bCI4UVAe+9DOzymN3aZTVUXbVYtbmmNrnyXe5D5She6zKUVFklNZHV1M2BlI39uhXtK+fDeSEKQuEMqMK9Nr85BeUQJQY44HoWWRfbxjkKteS/yUvHCwfbMCQr6yyZ8bgJF58Bq0RfVgCcnOAsVI2sABYgECS4fYTMgyUPGTR53tywpowH5tHQV6R0U6Iwy/0QRdXsUeTMeORIb9ixiEx1tMa92+CPlvCbkjqCHY9WNqeFPUCtH+CgIHaguscPUL9VRjzrcpuaqTaB+Z4XrPQP100fXHxKE54XVHpvxvVyq6v8rqbEdJrLtCM5nV9DPZAer9hQEaAOI8V5sInjfDAwm3GBg/v7a9Yf1P/lRX9+nynix76fWPYkxKLdVJVKgLTnwbyipORBBm9UQSo50sKn1z/SiTp8tA+WnmzED6drsbod9MJIpDOVTyDpkQSYELA3Bk1Rr0PqEgUtCbcg95hPCLh2xAP1D4Abk=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: aacc9396-bd30-4d3b-0fc7-08db23a5c46c
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:47.5830
 (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: OhudysfflbxL1t0htYilXv0zP+JwL2wxmB/flFdMn0iVCC0NaSK9FcRkAsd7sYILgYlEL3lsNfrJ6PeHwkusMw==
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 spamscore=0 malwarescore=0 mlxscore=0
 mlxlogscore=999 suspectscore=0 adultscore=0 phishscore=0 bulkscore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2212070000
 definitions=main-2303130077
X-Proofpoint-GUID: OqJSCrVDfQRIQlztVg8oyO1jE88XGOW0
X-Proofpoint-ORIG-GUID: OqJSCrVDfQRIQlztVg8oyO1jE88XGOW0
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

The check for device pointer for the SCSI command is unnecessary, so drop
it.

The only caller is scsi_try_host_reset() -> eh_host_reset_handler(),
and there that pointer cannot be NULL.

Indeed, there is already code later in the same function which does not
check the device pointer for the SCSI command.

Signed-off-by: John Garry <john.g.garry@oracle.com>
---
 drivers/scsi/scsi_debug.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/scsi/scsi_debug.c b/drivers/scsi/scsi_debug.c
index 749358b48335..47820b9f6326 100644
--- a/drivers/scsi/scsi_debug.c
+++ b/drivers/scsi/scsi_debug.c
@@ -5440,7 +5440,7 @@ static int scsi_debug_host_reset(struct scsi_cmnd *SCpnt)
 	int k = 0;
 
 	++num_host_resets;
-	if ((SCpnt->device) && (SDEBUG_OPT_ALL_NOISE & sdebug_opts))
+	if (SDEBUG_OPT_ALL_NOISE & sdebug_opts)
 		sdev_printk(KERN_INFO, SCpnt->device, "%s\n", __func__);
 	spin_lock(&sdebug_host_list_lock);
 	list_for_each_entry(sdbg_host, &sdebug_host_list, host_list) {
-- 
2.35.3