@@ -104,19 +104,7 @@ static void sd_config_discard(struct scsi_disk *, unsigned int);
104
104
static void sd_config_write_same (struct scsi_disk * );
105
105
static int sd_revalidate_disk (struct gendisk * );
106
106
static void sd_unlock_native_capacity (struct gendisk * disk );
107
- static int sd_probe (struct device * );
108
- static int sd_remove (struct device * );
109
107
static void sd_shutdown (struct device * );
110
- static int sd_suspend_system (struct device * );
111
- static int sd_suspend_runtime (struct device * );
112
- static int sd_resume_system (struct device * );
113
- static int sd_resume_runtime (struct device * );
114
- static void sd_rescan (struct device * );
115
- static blk_status_t sd_init_command (struct scsi_cmnd * SCpnt );
116
- static void sd_uninit_command (struct scsi_cmnd * SCpnt );
117
- static int sd_done (struct scsi_cmnd * );
118
- static void sd_eh_reset (struct scsi_cmnd * );
119
- static int sd_eh_action (struct scsi_cmnd * , int );
120
108
static void sd_read_capacity (struct scsi_disk * sdkp , unsigned char * buffer );
121
109
static void scsi_disk_release (struct device * cdev );
122
110
@@ -592,33 +580,6 @@ static struct class sd_disk_class = {
592
580
.dev_groups = sd_disk_groups ,
593
581
};
594
582
595
- static const struct dev_pm_ops sd_pm_ops = {
596
- .suspend = sd_suspend_system ,
597
- .resume = sd_resume_system ,
598
- .poweroff = sd_suspend_system ,
599
- .restore = sd_resume_system ,
600
- .runtime_suspend = sd_suspend_runtime ,
601
- .runtime_resume = sd_resume_runtime ,
602
- };
603
-
604
- static struct scsi_driver sd_template = {
605
- .gendrv = {
606
- .name = "sd" ,
607
- .owner = THIS_MODULE ,
608
- .probe = sd_probe ,
609
- .probe_type = PROBE_PREFER_ASYNCHRONOUS ,
610
- .remove = sd_remove ,
611
- .shutdown = sd_shutdown ,
612
- .pm = & sd_pm_ops ,
613
- },
614
- .rescan = sd_rescan ,
615
- .init_command = sd_init_command ,
616
- .uninit_command = sd_uninit_command ,
617
- .done = sd_done ,
618
- .eh_action = sd_eh_action ,
619
- .eh_reset = sd_eh_reset ,
620
- };
621
-
622
583
/*
623
584
* Don't request a new module, as that could deadlock in multipath
624
585
* environment.
@@ -3926,6 +3887,33 @@ static int sd_resume_runtime(struct device *dev)
3926
3887
return sd_resume (dev );
3927
3888
}
3928
3889
3890
+ static const struct dev_pm_ops sd_pm_ops = {
3891
+ .suspend = sd_suspend_system ,
3892
+ .resume = sd_resume_system ,
3893
+ .poweroff = sd_suspend_system ,
3894
+ .restore = sd_resume_system ,
3895
+ .runtime_suspend = sd_suspend_runtime ,
3896
+ .runtime_resume = sd_resume_runtime ,
3897
+ };
3898
+
3899
+ static struct scsi_driver sd_template = {
3900
+ .gendrv = {
3901
+ .name = "sd" ,
3902
+ .owner = THIS_MODULE ,
3903
+ .probe = sd_probe ,
3904
+ .probe_type = PROBE_PREFER_ASYNCHRONOUS ,
3905
+ .remove = sd_remove ,
3906
+ .shutdown = sd_shutdown ,
3907
+ .pm = & sd_pm_ops ,
3908
+ },
3909
+ .rescan = sd_rescan ,
3910
+ .init_command = sd_init_command ,
3911
+ .uninit_command = sd_uninit_command ,
3912
+ .done = sd_done ,
3913
+ .eh_action = sd_eh_action ,
3914
+ .eh_reset = sd_eh_reset ,
3915
+ };
3916
+
3929
3917
/**
3930
3918
* init_sd - entry point for this driver (both when built in or when
3931
3919
* a module).
0 commit comments