[PATCH] virtio/s390: fixup for implement PM operations for virtio_ccw
STALE3209d
From: Christian Borntraeger <hidden>
Date: 2017-12-18 08:37:06
Subsystem:
s390 architecture, the rest, virtio drivers for s390 · Maintainers:
Heiko Carstens, Vasily Gorbik, Alexander Gordeev, Linus Torvalds, Cornelia Huck, Halil Pasic, Eric Farman
Possibly related (same subject, not in this thread)
- 2017-12-18 · Re: [PATCH] virtio/s390: fixup for implement PM operations for virtio_ccw · Christian Borntraeger <hidden>
- 2017-12-18 · Re: [PATCH] virtio/s390: fixup for implement PM operations for virtio_ccw · Thomas Huth <hidden>
- 2017-12-18 · Re: [PATCH] virtio/s390: fixup for implement PM operations for virtio_ccw · Cornelia Huck <cohuck@redhat.com>
We need to disable the pm callbacks if CONFIG_PM is not set. Signed-off-by: Christian Borntraeger <redacted> --- Cornelia, you might want to squash this into the original commit. drivers/s390/virtio/virtio_ccw.c | 4 ++++ 1 file changed, 4 insertions(+)
diff --git a/drivers/s390/virtio/virtio_ccw.c b/drivers/s390/virtio/virtio_ccw.c
index 330b3fa3430a..985184ebda45 100644
--- a/drivers/s390/virtio/virtio_ccw.c
+++ b/drivers/s390/virtio/virtio_ccw.c@@ -1315,6 +1315,7 @@ static struct ccw_device_id virtio_ids[] = { {}, }; +#ifdef CONFIG_PM_SLEEP static int virtio_ccw_freeze(struct ccw_device *cdev) { struct virtio_ccw_device *vcdev = dev_get_drvdata(&cdev->dev);
@@ -1333,6 +1334,7 @@ static int virtio_ccw_restore(struct ccw_device *cdev) return virtio_device_restore(&vcdev->vdev); } +#endif static struct ccw_driver virtio_ccw_driver = { .driver = {
@@ -1346,9 +1348,11 @@ static struct ccw_driver virtio_ccw_driver = { .set_online = virtio_ccw_online, .notify = virtio_ccw_cio_notify, .int_class = IRQIO_VIR, +#ifdef CONFIG_PM_SLEEP .freeze = virtio_ccw_freeze, .thaw = virtio_ccw_restore, .restore = virtio_ccw_restore, +#endif }; static int __init pure_hex(char **cp, unsigned int *val, int min_digit,
--
2.13.4