Skip to content

Commit 9e6075e

Browse files
damien-lemoalgregkh
authored andcommitted
scsi: Remove scsi device no_start_on_resume flag
[ Upstream commit c4367ac ] 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 0a85890 ("ata,scsi: do not issue START STOP UNIT on resume"). Signed-off-by: Damien Le Moal <dlemoal@kernel.org> Reviewed-by: Hannes Reinecke <hare@suse.de> Tested-by: Chia-Lin Kao (AceLan) <acelan.kao@canonical.com> Tested-by: Geert Uytterhoeven <geert+renesas@glider.be> Reviewed-by: Martin K. Petersen <martin.petersen@oracle.com> Stable-dep-of: 7a6bbc2 ("scsi: sd: Do not repeat the starting disk message") Signed-off-by: Sasha Levin <sashal@kernel.org>
1 parent 2e56117 commit 9e6075e

File tree

2 files changed

+3
-7
lines changed

2 files changed

+3
-7
lines changed

drivers/scsi/sd.c

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3968,7 +3968,7 @@ static int sd_resume(struct device *dev)
39683968
static int sd_resume_common(struct device *dev, bool runtime)
39693969
{
39703970
struct scsi_disk *sdkp = dev_get_drvdata(dev);
3971-
int ret = 0;
3971+
int ret;
39723972

39733973
if (!sdkp) /* E.g.: runtime resume at the start of sd_probe() */
39743974
return 0;
@@ -3978,11 +3978,8 @@ static int sd_resume_common(struct device *dev, bool runtime)
39783978
return 0;
39793979
}
39803980

3981-
if (!sdkp->device->no_start_on_resume) {
3982-
sd_printk(KERN_NOTICE, sdkp, "Starting disk\n");
3983-
ret = sd_start_stop_device(sdkp, 1);
3984-
}
3985-
3981+
sd_printk(KERN_NOTICE, sdkp, "Starting disk\n");
3982+
ret = sd_start_stop_device(sdkp, 1);
39863983
if (!ret) {
39873984
sd_resume(dev);
39883985
sdkp->suspended = false;

include/scsi/scsi_device.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,6 @@ struct scsi_device {
216216
unsigned use_192_bytes_for_3f:1; /* ask for 192 bytes from page 0x3f */
217217
unsigned no_start_on_add:1; /* do not issue start on add */
218218
unsigned allow_restart:1; /* issue START_UNIT in error handler */
219-
unsigned no_start_on_resume:1; /* Do not issue START_STOP_UNIT on resume */
220219
unsigned start_stop_pwr_cond:1; /* Set power cond. in START_STOP_UNIT */
221220
unsigned no_uld_attach:1; /* disable connecting to upper level drivers */
222221
unsigned select_no_atn:1;

0 commit comments

Comments
 (0)