Commit 1c957532 authored by Bart Van Assche's avatar Bart Van Assche Committed by Martin K. Petersen
Browse files

scsi: sd: Rename sd_resume() into sd_resume_system() 

This patch does not change any functionality but makes the next patch in
this series easier to read.

Link: https://lore.kernel.org/r/20211006215453.3318929-3-bvanassche@acm.org


Cc: Alan Stern <stern@rowland.harvard.edu>
Cc: Dan Williams <dan.j.williams@intel.com>
Cc: Hannes Reinecke <hare@suse.com>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Martin Kepplinger <martin.kepplinger@puri.sm>
Signed-off-by: default avatarBart Van Assche <bvanassche@acm.org>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent a19a93e4

drivers/scsi/sd.c

+8 −3
Original line number Diff line number Diff line
@@ -109,7 +109,7 @@ static int sd_remove(struct device *); 
static void sd_shutdown(struct device *);

static int sd_suspend_system(struct device *);

static int sd_suspend_runtime(struct device *);

static int sd_resume(struct device *);

static int sd_resume_system(struct device *);

static int sd_resume_runtime(struct device *);

static void sd_rescan(struct device *);

static blk_status_t sd_init_command(struct scsi_cmnd *SCpnt);
@@ -602,9 +602,9 @@ static struct class sd_disk_class = { 


static const struct dev_pm_ops sd_pm_ops = {

	.suspend		= sd_suspend_system,

	.resume			= sd_resume,

	.resume			= sd_resume_system,

	.poweroff		= sd_suspend_system,

	.restore		= sd_resume,

	.restore		= sd_resume_system,

	.runtime_suspend	= sd_suspend_runtime,

	.runtime_resume		= sd_resume_runtime,

};
@@ -3686,6 +3686,11 @@ static int sd_resume(struct device *dev) 
	return ret;

}



static int sd_resume_system(struct device *dev)

{

	return sd_resume(dev);

}



static int sd_resume_runtime(struct device *dev)

{

	struct scsi_disk *sdkp = dev_get_drvdata(dev);