Commit c4367ac8 authored by Damien Le Moal's avatar Damien Le Moal
Browse files

scsi: Remove scsi device no_start_on_resume flag 



The scsi device flag no_start_on_resume is not set by any scsi low
level driver. Remove it. This reverts the changes introduced by commit
0a858905 ("ata,scsi: do not issue START STOP UNIT on resume").

Signed-off-by: default avatarDamien Le Moal <dlemoal@kernel.org>
Reviewed-by: default avatarHannes Reinecke <hare@suse.de>
Tested-by: default avatarChia-Lin Kao (AceLan) <acelan.kao@canonical.com>
Tested-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Reviewed-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 0e195481

drivers/scsi/sd.c

+3 −6
Original line number Diff line number Diff line
@@ -3895,7 +3895,7 @@ static int sd_suspend_runtime(struct device *dev) 
static int sd_resume(struct device *dev, bool runtime)

{

	struct scsi_disk *sdkp = dev_get_drvdata(dev);

	int ret = 0;

	int ret;



	if (!sdkp)	/* E.g.: runtime resume at the start of sd_probe() */

		return 0;
@@ -3905,11 +3905,8 @@ static int sd_resume(struct device *dev, bool runtime) 
		return 0;

	}



	if (!sdkp->device->no_start_on_resume) {

	sd_printk(KERN_NOTICE, sdkp, "Starting disk\n");

	ret = sd_start_stop_device(sdkp, 1);

	}



	if (!ret) {

		opal_unlock_from_suspend(sdkp->opal_dev);

		sdkp->suspended = false;

include/scsi/scsi_device.h

+0 −1
Original line number Diff line number Diff line
@@ -197,7 +197,6 @@ struct scsi_device { 
	unsigned use_192_bytes_for_3f:1; /* ask for 192 bytes from page 0x3f */

	unsigned no_start_on_add:1;	/* do not issue start on add */

	unsigned allow_restart:1; /* issue START_UNIT in error handler */

	unsigned no_start_on_resume:1; /* Do not issue START_STOP_UNIT on resume */

	unsigned start_stop_pwr_cond:1;	/* Set power cond. in START_STOP_UNIT */

	unsigned no_uld_attach:1; /* disable connecting to upper level drivers */

	unsigned select_no_atn:1;