From: Cornelia Huck <cohuck@redhat.com>
To: Halil Pasic <pasic@linux.ibm.com>
Cc: linux-s390@vger.kernel.org,
virtualization@lists.linux-foundation.org, kvm@vger.kernel.org
Subject: Re: [PATCH] s390/virtio: remove unused pm callbacks
Date: Wed, 3 Jun 2020 08:43:56 +0200 [thread overview]
Message-ID: <20200603084356.326d66aa.cohuck@redhat.com> (raw)
In-Reply-To: <20200526093629.257649-1-cohuck@redhat.com>
Friendly ping.
On Tue, 26 May 2020 11:36:29 +0200
Cornelia Huck <cohuck@redhat.com> wrote:
> Support for hibernation on s390 has been recently been removed with
(one 'been' too much here, I just noticed :)
> commit 394216275c7d ("s390: remove broken hibernate / power management
> support"), no need to keep unused code around.
>
> Signed-off-by: Cornelia Huck <cohuck@redhat.com>
> ---
> drivers/s390/virtio/virtio_ccw.c | 26 --------------------------
> 1 file changed, 26 deletions(-)
>
> diff --git a/drivers/s390/virtio/virtio_ccw.c b/drivers/s390/virtio/virtio_ccw.c
> index 957889a42d2e..5730572b52cd 100644
> --- a/drivers/s390/virtio/virtio_ccw.c
> +++ b/drivers/s390/virtio/virtio_ccw.c
> @@ -1372,27 +1372,6 @@ 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);
> -
> - return virtio_device_freeze(&vcdev->vdev);
> -}
> -
> -static int virtio_ccw_restore(struct ccw_device *cdev)
> -{
> - struct virtio_ccw_device *vcdev = dev_get_drvdata(&cdev->dev);
> - int ret;
> -
> - ret = virtio_ccw_set_transport_rev(vcdev);
> - if (ret)
> - return ret;
> -
> - return virtio_device_restore(&vcdev->vdev);
> -}
> -#endif
> -
> static struct ccw_driver virtio_ccw_driver = {
> .driver = {
> .owner = THIS_MODULE,
> @@ -1405,11 +1384,6 @@ 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,
WARNING: multiple messages have this Message-ID (diff)
From: Cornelia Huck <cohuck@redhat.com>
To: Halil Pasic <pasic@linux.ibm.com>
Cc: linux-s390@vger.kernel.org, kvm@vger.kernel.org,
virtualization@lists.linux-foundation.org
Subject: Re: [PATCH] s390/virtio: remove unused pm callbacks
Date: Wed, 3 Jun 2020 08:43:56 +0200 [thread overview]
Message-ID: <20200603084356.326d66aa.cohuck@redhat.com> (raw)
In-Reply-To: <20200526093629.257649-1-cohuck@redhat.com>
Friendly ping.
On Tue, 26 May 2020 11:36:29 +0200
Cornelia Huck <cohuck@redhat.com> wrote:
> Support for hibernation on s390 has been recently been removed with
(one 'been' too much here, I just noticed :)
> commit 394216275c7d ("s390: remove broken hibernate / power management
> support"), no need to keep unused code around.
>
> Signed-off-by: Cornelia Huck <cohuck@redhat.com>
> ---
> drivers/s390/virtio/virtio_ccw.c | 26 --------------------------
> 1 file changed, 26 deletions(-)
>
> diff --git a/drivers/s390/virtio/virtio_ccw.c b/drivers/s390/virtio/virtio_ccw.c
> index 957889a42d2e..5730572b52cd 100644
> --- a/drivers/s390/virtio/virtio_ccw.c
> +++ b/drivers/s390/virtio/virtio_ccw.c
> @@ -1372,27 +1372,6 @@ 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);
> -
> - return virtio_device_freeze(&vcdev->vdev);
> -}
> -
> -static int virtio_ccw_restore(struct ccw_device *cdev)
> -{
> - struct virtio_ccw_device *vcdev = dev_get_drvdata(&cdev->dev);
> - int ret;
> -
> - ret = virtio_ccw_set_transport_rev(vcdev);
> - if (ret)
> - return ret;
> -
> - return virtio_device_restore(&vcdev->vdev);
> -}
> -#endif
> -
> static struct ccw_driver virtio_ccw_driver = {
> .driver = {
> .owner = THIS_MODULE,
> @@ -1405,11 +1384,6 @@ 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,
next prev parent reply other threads:[~2020-06-03 6:44 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-26 9:36 [PATCH] s390/virtio: remove unused pm callbacks Cornelia Huck
2020-05-26 9:36 ` Cornelia Huck
2020-06-03 6:43 ` Cornelia Huck [this message]
2020-06-03 6:43 ` Cornelia Huck
2020-06-04 21:44 ` Halil Pasic
2020-06-05 7:39 ` Cornelia Huck
2020-06-05 10:52 ` Heiko Carstens
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=20200603084356.326d66aa.cohuck@redhat.com \
--to=cohuck@redhat.com \
--cc=kvm@vger.kernel.org \
--cc=linux-s390@vger.kernel.org \
--cc=pasic@linux.ibm.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.