From: Christian Borntraeger <borntraeger@de.ibm.com>
To: Halil Pasic <pasic@linux.vnet.ibm.com>,
Cornelia Huck <cohuck@redhat.com>
Cc: linux-s390@vger.kernel.org,
virtualization@lists.linux-foundation.org, kvm@vger.kernel.org,
Thomas Huth <thuth@redhat.com>,
kbuild-all@01.org, kbuild test robot <fengguang.wu@intel.com>,
Christian Borntraeger <borntraeger@de.ibm.com>
Subject: [PATCH] virtio/s390: fixup for implement PM operations for virtio_ccw
Date: Mon, 18 Dec 2017 09:37:06 +0100 [thread overview]
Message-ID: <20171218083706.223836-1-borntraeger@de.ibm.com> (raw)
In-Reply-To: <201712171200.w6OAf5Jm%fengguang.wu@intel.com>
We need to disable the pm callbacks if CONFIG_PM is not set.
Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
---
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
next prev parent reply other threads:[~2017-12-18 8:37 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-12-17 4:37 [kvms390:for-vhost 1/1] drivers/s390/virtio/virtio_ccw.c:1322:9: error: implicit declaration of func kbuild test robot
2017-12-18 8:37 ` Christian Borntraeger [this message]
2017-12-18 8:49 ` [PATCH] virtio/s390: fixup for implement PM operations for virtio_ccw Cornelia Huck
2017-12-18 8:52 ` Thomas Huth
2017-12-18 8:59 ` Christian Borntraeger
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20171218083706.223836-1-borntraeger@de.ibm.com \
--to=borntraeger@de.ibm.com \
--cc=cohuck@redhat.com \
--cc=fengguang.wu@intel.com \
--cc=kbuild-all@01.org \
--cc=kvm@vger.kernel.org \
--cc=linux-s390@vger.kernel.org \
--cc=pasic@linux.vnet.ibm.com \
--cc=thuth@redhat.com \
--cc=virtualization@lists.linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox