Commit a19226f8 authored by John Garry's avatar John Garry Committed by Martin K. Petersen
Browse files

scsi: scsi_debug: Drop scsi_debug_device_reset() NULL pointer checks 



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: default avatarJohn Garry <john.g.garry@oracle.com>
Acked-by: default avatarDouglas Gilbert <dgilbert@interlog.com>
Link: https://lore.kernel.org/r/20230313093114.1498305-5-john.g.garry@oracle.com


Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 06be9fbe

drivers/scsi/scsi_debug.c

+8 −9
Original line number Diff line number Diff line
@@ -5372,17 +5372,16 @@ static int scsi_debug_abort(struct scsi_cmnd *SCpnt) 


static int scsi_debug_device_reset(struct scsi_cmnd *SCpnt)

{

	++num_dev_resets;

	if (SCpnt && SCpnt->device) {

	struct scsi_device *sdp = SCpnt->device;

		struct sdebug_dev_info *devip =

				(struct sdebug_dev_info *)sdp->hostdata;

	struct sdebug_dev_info *devip = sdp->hostdata;



	++num_dev_resets;



	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;

}