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 07/11] scsi: scsi_debug: Drop scsi_debug_host_reset() device NULL pointer check
Date:   Tue,  7 Mar 2023 10:55:51 +0000
Message-Id: <20230307105555.3745277-8-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?QfuLknIoR1X5+psfLcwZINWD5EcuS2n9pB65MRFNiMrLvJLJzJogGXjOsFLG?=
 =?us-ascii?Q?hl84fjTAaieSi4htdxuv8qq8GFan4JavOmBVAC3BwAldsUb3tHxqvmilazOx?=
 =?us-ascii?Q?OO4TjoyueOlKuHV3y5fT1Bw+cjQAtUWqc6CODGSD/hq1W+dcYjAfcxezd4Kb?=
 =?us-ascii?Q?YWXtPAaVjoK6cdjdr0aFj+wkd9p4xVxq+4F/StJfMmSjMQxxcYxabPRIDqJy?=
 =?us-ascii?Q?T/VJqivL1PdzlEc0sQ73VIdVO8apUaDzUlcjQTIHrdDFZVHpIhzfFxbAx0Ca?=
 =?us-ascii?Q?PVfuGcZsYc88pFovMTXRcGngfDrzJfUyG0PnENEtEB7lOqjG0gtoCZpraWE9?=
 =?us-ascii?Q?CrEmuxaJj3Q3U0jjuWrB03JKrPPcyOqaYwQduseV6hpsqZv0GM594qv6q1Mf?=
 =?us-ascii?Q?Pl4darTOZvalt2XmJIP8uH9XWxMtTSzzolAJkrRY31Z0eSwqDU1kHoL/lDcI?=
 =?us-ascii?Q?FR4tuOYnFrH8Ji+BuGaiVueOMc52H+EDTqfJfrs5gQToby6v0CGn6ub7oxvQ?=
 =?us-ascii?Q?eVWexXUCiC8Nkr9V5KoKniT2RVDq/Uss097CVSi6P17Q2wTYRhZ9Pszix685?=
 =?us-ascii?Q?42RNNn5FmCEjcqHbUO0W4u+qBF39E/fIiBZvqFrDw3ZtvTKUmFiMxcUwExyu?=
 =?us-ascii?Q?szMv15sRdZAgwp2TwTRoofc4W2uAL95xOhyntKBzO3tAVZTKf+apFB4zUvqv?=
 =?us-ascii?Q?5yN2Mmtxrqx3NMe+TEohKvQ2L0I3qECxNErNnNvQG8wfZKwkNI8aSgHfsXxx?=
 =?us-ascii?Q?948nXB0b61kMfL5X4+VHC9rnR3UGRu6mAtxXmBwGPbSwkrPQN8JgywlBtcBG?=
 =?us-ascii?Q?Mulq12NN+u0rWjgWBnrsWtWzcWhJhTlFFvEQhUMIaYn7FYp8WX01Y6sgWKu0?=
 =?us-ascii?Q?17RcjP7exUO/fIW11MY1B5GkB8w00n4TNlrvvhWiLMi9qmTL2kIi5R/4fmf2?=
 =?us-ascii?Q?1f5R/SZmCV4ar5ZqSU1lswVctne3ls/RKzs2BI9FKV0/0CN6SoTVPAYKjJy2?=
 =?us-ascii?Q?QcezLe1MrEN8lx8lUzuDMIB+nLxHnSUnOx1r5dJ8S1zZCBlvpKf68IxpYILw?=
 =?us-ascii?Q?BijZ0LXKHSOCvUHjg6pfWVAm8D+T8/PtL5rBlNR8tgX9Opm1Cm9ok63buQk9?=
 =?us-ascii?Q?YGFYDD2mVHywWh9efuPUXzRQKk+WdPXqZHThav8mNMDFxoS934CMyL85ZZHI?=
 =?us-ascii?Q?V4oyuQDc/LZ6xJEEeQdph3jerQ6N00X8jBVElwmL2NqkOh5+EWpeepPR6EMd?=
 =?us-ascii?Q?vZy43+HfPZ7KA+zEctBkDIQQPfOxyGSzz9WpNg8R+oGTtkBAM+kpafnmA5ew?=
 =?us-ascii?Q?c+3ysQfEeQAEqiA0G5M0LYIJJ2Ej/NoO19Kvi6oJmu0v0TtWssPbSV3UNrSe?=
 =?us-ascii?Q?UYC3cizaUnYZGAUhDz4V/o1pnYfEByqRd/RGtdlhf5vHy6aaAOJZpNqo3OfB?=
 =?us-ascii?Q?qPXwapDnGMk7B4T9/GnVXmUH3nsK5eYzckU/zmNHWGkHja3HtIGA5SFnzaJb?=
 =?us-ascii?Q?8XhTkGr3qNoSMDbuzyEgoZCSNOerXIUvIL5r/VMb5GnKeDj3imSwtVfQIAH3?=
 =?us-ascii?Q?eJQ6QCrWUfDscNsRORMy5DlhyXRRkdIdIs+62tMqH2wWpbx/lDUvN7ACjJiO?=
 =?us-ascii?Q?GA=3D=3D?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: dv1mImbievYVzpPuiKUAflxs2uMKMankbgIQFD58YsJtRq36YnVIawzoX3kQq+/51if8Y7ZGPWMJCVWmDsERsINTWx1xPDh0At9Hfs3QyK9me/i4zeS8VgeM0OOsw5UXI9SFnEGX49P4n0MavmfNTsnJ0wnQLMHQN2osOEpoXMb76od+GpYDMWSvZOH77VK+iYudYyZzH12yXtAU++e/eCAqDqd5APRjTMo/4//Oc9N+dPCJIkafFUXPmfHkHD9KYv59EdET8L2g09M7OQfaX+S4Vr7G/1zf/UHdB7/UfS/Dd3WvIbG+bxJvXnBnTTxUsLb1T4CAeb6SCJbi/ExnsgVC33xtLFeGO7OLrcsHPTFLSxMSoTBisx/TE9Wy1Zc9jrXYQeVXbkbP+lxpSFV8lB7ZUHO2B7gKVfPrRc8w51NmhT4uctq/bP+fjurfAnRQKdQHIl/40TxfyedosIfEU+XlmCb7PruiaXxPMAnreqDd0zU4GOf1p/VZYbxgWsmgGxIVcpi0G+6gdGX73Dg1DIIffwT2fOGrtLrwlH1FrUY94URrkgrsSpBeUA3hb7AFzB6Q6lRYdo/zYhB6/ERx8pm0L7DQAlQxwhcW37KwuNOmNBeCQaQoGWFAQwOS120BvhTolHSQX8QqljwaJmHW3Uo3zykkUQAPSdPj+qZpo3UBgXqWxkNGQsBfq7dzyZGHLelj8unLP2uMqpS9EdnrJifInkaBbckV3X/aaJ3VyyhweBCVted9l3J9so40xnkcxKT29S0eDu3SpEroQv8kALReJlgMZ328H21Ng+aNG3iOjYZIymoNCWILgWGr4V+8tk14m2/SfxFLX5OitjWIvQ==
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 4fe9f871-a98a-41d8-0394-08db1efaa386
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:43.8120
 (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: O/Q2A9RJB8RB5rIF094RYiB3sUbTL2RVjjnN4HWuGTq0s6Ic+DwtQnXISjIc51FEBn+tgJSmpB3hPOWfe39OoA==
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 bulkscore=0 mlxscore=0 adultscore=0
 spamscore=0 suspectscore=0 mlxlogscore=999 phishscore=0 malwarescore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2212070000
 definitions=main-2303070098
X-Proofpoint-GUID: 5c_RBjOqSlILJBrmgmy5PvcIJife8IT9
X-Proofpoint-ORIG-GUID: 5c_RBjOqSlILJBrmgmy5PvcIJife8IT9
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 6f1dbd8dc37f..6707ccdc07c9 100644
--- a/drivers/scsi/scsi_debug.c
+++ b/drivers/scsi/scsi_debug.c
@@ -5446,7 +5446,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