* [PATCH] s390/virtio: remove unused pm callbacks
@ 2020-05-26 9:36 Cornelia Huck
2020-06-03 6:43 ` Cornelia Huck
2020-06-04 21:44 ` Halil Pasic
0 siblings, 2 replies; 5+ messages in thread
From: Cornelia Huck @ 2020-05-26 9:36 UTC (permalink / raw)
To: Halil Pasic; +Cc: linux-s390, Cornelia Huck, kvm, virtualization
Support for hibernation on s390 has been recently been removed with
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,
--
2.25.4
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH] s390/virtio: remove unused pm callbacks
2020-05-26 9:36 [PATCH] s390/virtio: remove unused pm callbacks Cornelia Huck
@ 2020-06-03 6:43 ` Cornelia Huck
2020-06-04 21:44 ` Halil Pasic
1 sibling, 0 replies; 5+ messages in thread
From: Cornelia Huck @ 2020-06-03 6:43 UTC (permalink / raw)
To: Halil Pasic; +Cc: linux-s390, kvm, virtualization
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,
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH] s390/virtio: remove unused pm callbacks
2020-05-26 9:36 [PATCH] s390/virtio: remove unused pm callbacks Cornelia Huck
2020-06-03 6:43 ` Cornelia Huck
@ 2020-06-04 21:44 ` Halil Pasic
2020-06-05 7:39 ` Cornelia Huck
1 sibling, 1 reply; 5+ messages in thread
From: Halil Pasic @ 2020-06-04 21:44 UTC (permalink / raw)
To: Cornelia Huck; +Cc: linux-s390, virtualization, kvm
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
> commit 394216275c7d ("s390: remove broken hibernate / power management
> support"), no need to keep unused code around.
>
> Signed-off-by: Cornelia Huck <cohuck@redhat.com>
Reviewed-by: Halil Pasic <pasic@linux.ibm.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,
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH] s390/virtio: remove unused pm callbacks
2020-06-04 21:44 ` Halil Pasic
@ 2020-06-05 7:39 ` Cornelia Huck
2020-06-05 10:52 ` Heiko Carstens
0 siblings, 1 reply; 5+ messages in thread
From: Cornelia Huck @ 2020-06-05 7:39 UTC (permalink / raw)
To: Halil Pasic, Heiko Carstens, Vasily Gorbik, Christian Borntraeger,
Michael S. Tsirkin
Cc: linux-s390, virtualization, kvm
On Thu, 4 Jun 2020 23:44:21 +0200
Halil Pasic <pasic@linux.ibm.com> wrote:
> 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
s/been recently been removed/recently been removed/
> > commit 394216275c7d ("s390: remove broken hibernate / power management
> > support"), no need to keep unused code around.
> >
> > Signed-off-by: Cornelia Huck <cohuck@redhat.com>
>
> Reviewed-by: Halil Pasic <pasic@linux.ibm.com>
Thanks!
As this is only a single patch, I think a pull request is a bit
overkill, so it would probably be best for someone to pick this
directly.
s390 arch maintainers? Michael?
>
> > ---
> > 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,
>
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH] s390/virtio: remove unused pm callbacks
2020-06-05 7:39 ` Cornelia Huck
@ 2020-06-05 10:52 ` Heiko Carstens
0 siblings, 0 replies; 5+ messages in thread
From: Heiko Carstens @ 2020-06-05 10:52 UTC (permalink / raw)
To: Cornelia Huck
Cc: Halil Pasic, Vasily Gorbik, Christian Borntraeger,
Michael S. Tsirkin, linux-s390, virtualization, kvm
On Fri, Jun 05, 2020 at 09:39:07AM +0200, Cornelia Huck wrote:
> On Thu, 4 Jun 2020 23:44:21 +0200
> Halil Pasic <pasic@linux.ibm.com> wrote:
>
> > 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
>
> s/been recently been removed/recently been removed/
>
> > > commit 394216275c7d ("s390: remove broken hibernate / power management
> > > support"), no need to keep unused code around.
> > >
> > > Signed-off-by: Cornelia Huck <cohuck@redhat.com>
> >
> > Reviewed-by: Halil Pasic <pasic@linux.ibm.com>
>
> Thanks!
>
> As this is only a single patch, I think a pull request is a bit
> overkill, so it would probably be best for someone to pick this
> directly.
>
> s390 arch maintainers? Michael?
Applied, thanks!
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2020-06-05 10:52 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-05-26 9:36 [PATCH] s390/virtio: remove unused pm callbacks Cornelia Huck
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
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).