diff options
author | Aaron Lu <aaron.lu@intel.com> | 2013-09-16 19:55:23 -0400 |
---|---|---|
committer | Rusty Russell <rusty@rustcorp.com.au> | 2013-09-23 02:15:58 -0400 |
commit | 891070003999e7ac8881bba6f8242615382742eb (patch) | |
tree | b9688861a4446b3fb58fc0c49a0816424b7617a8 /drivers/scsi | |
parent | d8524ae9d6f492a9c6db9f4d89c5f9b8782fa2d5 (diff) |
virtio: pm: use CONFIG_PM_SLEEP instead of CONFIG_PM
The freeze and restore functions defined in virtio drivers are used
for suspend and hibernate, so CONFIG_PM_SLEEP is more appropriate than
CONFIG_PM. This patch replace all CONFIG_PM with CONFIG_PM_SLEEP for
virtio drivers that implement freeze and restore callbacks.
Signed-off-by: Aaron Lu <aaron.lu@intel.com>
Reviewed-by: Amit Shah <amit.shah@redhat.com>
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Diffstat (limited to 'drivers/scsi')
-rw-r--r-- | drivers/scsi/virtio_scsi.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/scsi/virtio_scsi.c b/drivers/scsi/virtio_scsi.c index 74b88efde6ad..2a110391f8ce 100644 --- a/drivers/scsi/virtio_scsi.c +++ b/drivers/scsi/virtio_scsi.c | |||
@@ -954,7 +954,7 @@ static void virtscsi_remove(struct virtio_device *vdev) | |||
954 | scsi_host_put(shost); | 954 | scsi_host_put(shost); |
955 | } | 955 | } |
956 | 956 | ||
957 | #ifdef CONFIG_PM | 957 | #ifdef CONFIG_PM_SLEEP |
958 | static int virtscsi_freeze(struct virtio_device *vdev) | 958 | static int virtscsi_freeze(struct virtio_device *vdev) |
959 | { | 959 | { |
960 | virtscsi_remove_vqs(vdev); | 960 | virtscsi_remove_vqs(vdev); |
@@ -988,7 +988,7 @@ static struct virtio_driver virtio_scsi_driver = { | |||
988 | .id_table = id_table, | 988 | .id_table = id_table, |
989 | .probe = virtscsi_probe, | 989 | .probe = virtscsi_probe, |
990 | .scan = virtscsi_scan, | 990 | .scan = virtscsi_scan, |
991 | #ifdef CONFIG_PM | 991 | #ifdef CONFIG_PM_SLEEP |
992 | .freeze = virtscsi_freeze, | 992 | .freeze = virtscsi_freeze, |
993 | .restore = virtscsi_restore, | 993 | .restore = virtscsi_restore, |
994 | #endif | 994 | #endif |