diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
index 6a0b8f8997181807ffa99e49ba82d4fdccc8d2e6..b3d27e5795433921b3c6062e4dd689ce430e0492 100644
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@ -4006,7 +4006,7 @@ static int sd_resume(struct device *dev)
 static int sd_resume_common(struct device *dev, bool runtime)
 {
 	struct scsi_disk *sdkp = dev_get_drvdata(dev);
-	int ret = 0;
+	int ret;
 	int retries = SD_START_STOP_RETRY_COUNT;
 
 	if (!sdkp)	/* E.g.: runtime resume at the start of sd_probe() */
@@ -4017,13 +4017,11 @@ static int sd_resume_common(struct device *dev, bool runtime)
 		return 0;
 	}
 
-	if (!sdkp->device->no_start_on_resume) {
-		sd_printk(KERN_NOTICE, sdkp, "Starting disk\n");
+	sd_printk(KERN_NOTICE, sdkp, "Starting disk\n");
 retry:
-		ret = sd_start_stop_device(sdkp, 1);
-		if (ret && ret != -ENODEV && retries--)
-			goto retry;
-	}
+	ret = sd_start_stop_device(sdkp, 1);
+	if (ret && ret != -ENODEV && retries--)
+		goto retry;
 
 	if (!ret) {
 		sd_resume(dev);
diff --git a/include/scsi/scsi_device.h b/include/scsi/scsi_device.h
index 1c3601ad06154340ef507309e9df26359d3bc380..fed8c602236250631b3ab7d04d07a0ed8c8201c9 100644
--- a/include/scsi/scsi_device.h
+++ b/include/scsi/scsi_device.h
@@ -217,7 +217,7 @@ 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 */
+	KABI_DEPRECATE(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;