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 04/11] scsi: scsi_debug: Drop scsi_debug_device_reset() NULL pointer checks
Date:   Mon, 13 Mar 2023 09:31:07 +0000
Message-Id: <20230313093114.1498305-5-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?YxbTW3RSklOSy5eLyhiaeFehvi1DmJ9xknBImm2grnX6I1AQtyW0IYcj+AOe?=
 =?us-ascii?Q?RWC6Y8ufsNQ8CKuqOqZvtwY3QkqP9aiAJ+SyGQGG1BP2pppfxCqNON2TdOC8?=
 =?us-ascii?Q?2xhwFvOPF+pIGQ/hgJD7WHNNYxKl8Kq8Aw+ky9VTUQEEUOJd509bJYy73oT6?=
 =?us-ascii?Q?kBfFSQ0jIYQ2EUvDZcDHGGBjEkhqKZqJzs2n/JGNJ5CgEP8QTxA4wSfFgoIp?=
 =?us-ascii?Q?AfBEqugpBTfJUpdfVu/nFoVXHVhqdlh9JdTyVz8Y+i/pbTAJp0ZfTTVyaNqH?=
 =?us-ascii?Q?hIA++MmVNqA68st3IksfIqhuDpvAzehInhjxaSUU8aU5vqhj0UoORPtaYH/J?=
 =?us-ascii?Q?YJbJ9ERIDeXf93x0v3zvG6X3tD47g3Rr7ZDUkqsLGw3YJoPRcqMG3dFeGTQW?=
 =?us-ascii?Q?lZiZjcHDtpSbIHfsp40d3fxsRoOu3CGohiefpFGaW0zPRwATUZryRdHL/mCV?=
 =?us-ascii?Q?+SbYxBiqu8ICdtuQcoTcjHRIxCzhZXPCcIwYbr2ZsTt1q5IKf0lu6Jl+nkhL?=
 =?us-ascii?Q?d3OzZEbXLKNmQqr6lFMnLtXovyPC7vHZXGan+aMBmExmAPET4Bp/f/xbI5aj?=
 =?us-ascii?Q?TT21JgyEPHkUBN4H0ArCWuq1IDK2t3IYQWfEjfQRu8D2S8ypvTqnyGoLRxKO?=
 =?us-ascii?Q?AVjPXkbCIQQOtLEPUhtI7plbViSbw4I72ztARy8wOAoOqTmp6RRyk3XkWX3W?=
 =?us-ascii?Q?nKmxYhIXNBUmPsBGn3Qixo5FIzR0nPdtMHRgb49cPi0AcuFQ0TWhYsq/m9r9?=
 =?us-ascii?Q?ZFc7T7QTOjRoIO9CVcIwgud/26NDll5TaUGvoUiMrgmT6RrRGtHt5KVDOI41?=
 =?us-ascii?Q?XoTTPaAhTCjFY+HHgw85P6TL2RdJ2h+G5fqr8ye0ouNTuouZLG6EbPyIEGB4?=
 =?us-ascii?Q?mC8iGh0RTVZjQnctJ6w74gZ8Fjpw4mJOTHex32p0RArm+Qt6YIWzirzAa8wv?=
 =?us-ascii?Q?7XanVaWWVB4Prs+zDpIgf1CmlYr9CLNAXwdankaFYwkSpZ7ZrZSChPz39wCO?=
 =?us-ascii?Q?2so8Z/CVpyoP1l2aIEA7Wr9IwDwV0yuctK1Y8Q0bTvYHs2YRCEpHWuVK/HdI?=
 =?us-ascii?Q?Okjs6Xn5KJ5GLAaoJ1ye8rXlAherOgC/moHml9dYsWFGUEzoK9/ZgL+1sPcz?=
 =?us-ascii?Q?0tfKh9JvBVSoHGcF35j9pIGGTirlwLzCe5QUOr7dyygfwrqwEJPqqcEW2GB5?=
 =?us-ascii?Q?XE/FwFm1Av96reO/ebOSTiShu3Kw5Ba60fdC9r9oWme+6+Fp2mx4qhOWAYww?=
 =?us-ascii?Q?3lCHJWsHgdOlhB7QN/SgH61crm41ArYnWfldsRfVSTjDGAPkMJul70GJQtuY?=
 =?us-ascii?Q?xt5JtmzJJgeRqt2O5xDfwqLRD4YULNwPtE72+wtTLqpynr2hz9n0Z8YpK2Rp?=
 =?us-ascii?Q?r4YlRxASVA/8SeX6Y8vLBsGxC2krktGg4zslATC0UYw3qMnHT9UChqNr3Ub7?=
 =?us-ascii?Q?Gwm166/OB9iB6ZZmEgdqyWCXW7RRIRhYWjgG6xPaHX/GdrbVDhsF/TQHfp8h?=
 =?us-ascii?Q?lc3dQha1VINrv66VPD4J8kdz9EYqhzKVuJX1HM2qmZfBzrokwYOYkJBRElh1?=
 =?us-ascii?Q?2YgIMJRsFMRCkTfXVkbQQPz+HQ5OgZlknvzmVfXTLTHFyTR3QV95fTHufDk0?=
 =?us-ascii?Q?wQ=3D=3D?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: 4WUkUpmb65U5UIzbWjH1Y5UjbrtwAOtfWytms+nRZT74F/QGNi9q3r3ecce6Bf9TgAncmBoy5Qa8qhhErw06jhuKHCZtU1Zy2zOb9rV0HO4jq5xW0gGUpVA+lOgYKyfmMkfVGy9lJLTJ7Iaf86UHW8owm4XthfCidMmRUKNFUx5Y573ZLS7pPSqIb3t3uYSzLv/mln+wlgkuXwIMnNvdP+cAPLS07fj1pEjmKoylO+0fEm9JKj4LYOsb1kOt/RppBnIdEGKIF0K5zAlQlWlCnuHRa+lbUNNYAuim24u+ZxFNfzE38HQnC/xoGmKJCckgmcHtYivEieKh1UvLaCR063UkKG4LWGN5FhedrPLfGc8TcZM2dXVZosW0oXOqdam1kmuKtiXbsREji7h8zpWhtgB18MUjqYBlaXrD3OXmscYfhmzXAqxFCJeCuPddEjz5NQORU3/yZvrgsADHm/Vdmq7Il+Wj30ZAkpHe5iarKLWD2DLLmAq20jqPLHPboQkeJTGcS0+DRjWorkkwvmprcypgl+avRdFHw6pU2uN9HddHf5eHUX5ro50x5tljXvrg4P+eLnzqBwD1AOKiKeLrJhQf3Zo7Toh1Z30POiddyDKoPeqqYgT3YM0q1LdOJXpSeVaMiitE1vsW3ozVNVLmdp0XZHD6MKVBx9/21kgJ1ciZBPP5o6FDsADqXsQGtj/Tgtk86w7l6XbOu4kvUsaAgY7zYGjFmj/Yfq2ns3dIDhZIsyyJHlkIejb2vn7HiEGp53IQ1j89QOdT0DDUHzS/d3wN47hGxNdyzAwCCAKkTVUVBXqbQFW2CxeVjibfYmezuei5K24gk66wszkY+MJmPuQ0hwKjkbOfuCxbvI2SRtw=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 860caf8c-dd7e-44ac-c15d-08db23a5bbaf
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:32.9512
 (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: mUakb+9sdwsoZeE3VMLdBJm0A50ZnJ9GYPFh4Yp0mP5Ta4xUlJu9oTLtOJ0jxna8t5/i8sfr43jRzeolu+aOwg==
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 phishscore=0
 suspectscore=0 spamscore=0 malwarescore=0 adultscore=0 mlxscore=0
 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1
 engine=8.12.0-2212070000 definitions=main-2303130077
X-Proofpoint-GUID: pVT8DSAzC1KW-IQeEC58lBfvoyH6JoiH
X-Proofpoint-ORIG-GUID: pVT8DSAzC1KW-IQeEC58lBfvoyH6JoiH
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

The SCSI cmnd pointer arg would never be NULL, so drop the check. In
addition, its SCSI device pointer would never be NULL (so drop that check
also).

The only caller is scsi_try_bus_device_reset(), and the command and its
device pointer could not be NULL when calling eh_device_reset_handler()
there.

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

diff --git a/drivers/scsi/scsi_debug.c b/drivers/scsi/scsi_debug.c
index 2c2a41b99641..5b51c24f7d09 100644
--- a/drivers/scsi/scsi_debug.c
+++ b/drivers/scsi/scsi_debug.c
@@ -5372,17 +5372,16 @@ static int scsi_debug_abort(struct scsi_cmnd *SCpnt)
 
 static int scsi_debug_device_reset(struct scsi_cmnd *SCpnt)
 {
+	struct scsi_device *sdp = SCpnt->device;
+	struct sdebug_dev_info *devip = sdp->hostdata;
+
 	++num_dev_resets;
-	if (SCpnt && SCpnt->device) {
-		struct scsi_device *sdp = SCpnt->device;
-		struct sdebug_dev_info *devip =
-				(struct sdebug_dev_info *)sdp->hostdata;
 
-		if (SDEBUG_OPT_ALL_NOISE & sdebug_opts)
-			sdev_printk(KERN_INFO, sdp, "%s\n", __func__);
-		if (devip)
-			set_bit(SDEBUG_UA_POR, devip->uas_bm);
-	}
+	if (SDEBUG_OPT_ALL_NOISE & sdebug_opts)
+		sdev_printk(KERN_INFO, sdp, "%s\n", __func__);
+	if (devip)
+		set_bit(SDEBUG_UA_POR, devip->uas_bm);
+
 	return SUCCESS;
 }
 
-- 
2.35.3