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/char/virtio_console.c | |
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/char/virtio_console.c')
-rw-r--r-- | drivers/char/virtio_console.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/char/virtio_console.c b/drivers/char/virtio_console.c index b79cf3e1b793..862fd54a0ffb 100644 --- a/drivers/char/virtio_console.c +++ b/drivers/char/virtio_console.c | |||
@@ -2142,7 +2142,7 @@ static struct virtio_device_id rproc_serial_id_table[] = { | |||
2142 | static unsigned int rproc_serial_features[] = { | 2142 | static unsigned int rproc_serial_features[] = { |
2143 | }; | 2143 | }; |
2144 | 2144 | ||
2145 | #ifdef CONFIG_PM | 2145 | #ifdef CONFIG_PM_SLEEP |
2146 | static int virtcons_freeze(struct virtio_device *vdev) | 2146 | static int virtcons_freeze(struct virtio_device *vdev) |
2147 | { | 2147 | { |
2148 | struct ports_device *portdev; | 2148 | struct ports_device *portdev; |
@@ -2220,7 +2220,7 @@ static struct virtio_driver virtio_console = { | |||
2220 | .probe = virtcons_probe, | 2220 | .probe = virtcons_probe, |
2221 | .remove = virtcons_remove, | 2221 | .remove = virtcons_remove, |
2222 | .config_changed = config_intr, | 2222 | .config_changed = config_intr, |
2223 | #ifdef CONFIG_PM | 2223 | #ifdef CONFIG_PM_SLEEP |
2224 | .freeze = virtcons_freeze, | 2224 | .freeze = virtcons_freeze, |
2225 | .restore = virtcons_restore, | 2225 | .restore = virtcons_restore, |
2226 | #endif | 2226 | #endif |