openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Aaron Lu 2013-09-17 09:25:23 +09:30 committed by Rusty Russell
parent d8524ae9d6
commit 8910700039
6 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/block/virtio_blk.c
View File

@ -899,7 +899,7 @@ static void virtblk_remove(struct virtio_device *vdev)
ida_simple_remove(&vd_index_ida, index); ida_simple_remove(&vd_index_ida, index);
} }
#ifdef CONFIG_PM #ifdef CONFIG_PM_SLEEP
static int virtblk_freeze(struct virtio_device *vdev) static int virtblk_freeze(struct virtio_device *vdev)
{ {
struct virtio_blk *vblk = vdev->priv; struct virtio_blk *vblk = vdev->priv;
@ -959,7 +959,7 @@ static struct virtio_driver virtio_blk = {
.probe = virtblk_probe, .probe = virtblk_probe,
.remove = virtblk_remove, .remove = virtblk_remove,
.config_changed = virtblk_config_changed, .config_changed = virtblk_config_changed,
#ifdef CONFIG_PM #ifdef CONFIG_PM_SLEEP
.freeze = virtblk_freeze, .freeze = virtblk_freeze,
.restore = virtblk_restore, .restore = virtblk_restore,
#endif #endif

4
drivers/char/hw_random/virtio-rng.c
View File

@ -133,7 +133,7 @@ static void virtrng_remove(struct virtio_device *vdev)
remove_common(vdev); remove_common(vdev);
} }
#ifdef CONFIG_PM #ifdef CONFIG_PM_SLEEP
static int virtrng_freeze(struct virtio_device *vdev) static int virtrng_freeze(struct virtio_device *vdev)
{ {
remove_common(vdev); remove_common(vdev);
@ -157,7 +157,7 @@ static struct virtio_driver virtio_rng_driver = {
.id_table = id_table, .id_table = id_table,
.probe = virtrng_probe, .probe = virtrng_probe,
.remove = virtrng_remove, .remove = virtrng_remove,
#ifdef CONFIG_PM #ifdef CONFIG_PM_SLEEP
.freeze = virtrng_freeze, .freeze = virtrng_freeze,
.restore = virtrng_restore, .restore = virtrng_restore,
#endif #endif

4
drivers/char/virtio_console.c
View File

@ -2142,7 +2142,7 @@ static struct virtio_device_id rproc_serial_id_table[] = {
static unsigned int rproc_serial_features[] = { static unsigned int rproc_serial_features[] = {
}; };
#ifdef CONFIG_PM #ifdef CONFIG_PM_SLEEP
static int virtcons_freeze(struct virtio_device *vdev) static int virtcons_freeze(struct virtio_device *vdev)
{ {
struct ports_device *portdev; struct ports_device *portdev;
@ -2220,7 +2220,7 @@ static struct virtio_driver virtio_console = {
.probe = virtcons_probe, .probe = virtcons_probe,
.remove = virtcons_remove, .remove = virtcons_remove,
.config_changed = config_intr, .config_changed = config_intr,
#ifdef CONFIG_PM #ifdef CONFIG_PM_SLEEP
.freeze = virtcons_freeze, .freeze = virtcons_freeze,
.restore = virtcons_restore, .restore = virtcons_restore,
#endif #endif

4
drivers/net/virtio_net.c
View File

@ -1683,7 +1683,7 @@ static void virtnet_remove(struct virtio_device *vdev)
free_netdev(vi->dev); free_netdev(vi->dev);
} }
#ifdef CONFIG_PM #ifdef CONFIG_PM_SLEEP
static int virtnet_freeze(struct virtio_device *vdev) static int virtnet_freeze(struct virtio_device *vdev)
{ {
struct virtnet_info *vi = vdev->priv; struct virtnet_info *vi = vdev->priv;
@ -1766,7 +1766,7 @@ static struct virtio_driver virtio_net_driver = {
.probe = virtnet_probe, .probe = virtnet_probe,
.remove = virtnet_remove, .remove = virtnet_remove,
.config_changed = virtnet_config_changed, .config_changed = virtnet_config_changed,
#ifdef CONFIG_PM #ifdef CONFIG_PM_SLEEP
.freeze = virtnet_freeze, .freeze = virtnet_freeze,
.restore = virtnet_restore, .restore = virtnet_restore,
#endif #endif

4
drivers/scsi/virtio_scsi.c
View File

@ -954,7 +954,7 @@ static void virtscsi_remove(struct virtio_device *vdev)
scsi_host_put(shost); scsi_host_put(shost);
} }
#ifdef CONFIG_PM #ifdef CONFIG_PM_SLEEP
static int virtscsi_freeze(struct virtio_device *vdev) static int virtscsi_freeze(struct virtio_device *vdev)
{ {
virtscsi_remove_vqs(vdev); virtscsi_remove_vqs(vdev);
@ -988,7 +988,7 @@ static struct virtio_driver virtio_scsi_driver = {
.id_table = id_table, .id_table = id_table,
.probe = virtscsi_probe, .probe = virtscsi_probe,
.scan = virtscsi_scan, .scan = virtscsi_scan,
#ifdef CONFIG_PM #ifdef CONFIG_PM_SLEEP
.freeze = virtscsi_freeze, .freeze = virtscsi_freeze,
.restore = virtscsi_restore, .restore = virtscsi_restore,
#endif #endif

4
drivers/virtio/virtio_balloon.c
View File

@ -513,7 +513,7 @@ static void virtballoon_remove(struct virtio_device *vdev)
kfree(vb); kfree(vb);
} }
#ifdef CONFIG_PM #ifdef CONFIG_PM_SLEEP
static int virtballoon_freeze(struct virtio_device *vdev) static int virtballoon_freeze(struct virtio_device *vdev)
{ {
struct virtio_balloon *vb = vdev->priv; struct virtio_balloon *vb = vdev->priv;
@ -556,7 +556,7 @@ static struct virtio_driver virtio_balloon_driver = {
.probe = virtballoon_probe, .probe = virtballoon_probe,
.remove = virtballoon_remove, .remove = virtballoon_remove,
.config_changed = virtballoon_changed, .config_changed = virtballoon_changed,
#ifdef CONFIG_PM #ifdef CONFIG_PM_SLEEP
.freeze = virtballoon_freeze, .freeze = virtballoon_freeze,
.restore = virtballoon_restore, .restore = virtballoon_restore,
#endif #endif