From 1c9575326a4a09bdb82c104ed1ab4e932c7a1f49 Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Wed, 6 Oct 2021 14:54:52 -0700 Subject: [PATCH] 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 Cc: Dan Williams Cc: Hannes Reinecke Cc: Adrian Hunter Cc: Martin Kepplinger Signed-off-by: Bart Van Assche Signed-off-by: Martin K. Petersen --- drivers/scsi/sd.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c index 842b78b..fcf84e5 100644 --- a/drivers/scsi/sd.c +++ b/drivers/scsi/sd.c @@ -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); -- 2.7.4