| Message ID | 20200526093629.257649-1-cohuck@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | s390/virtio: remove unused pm callbacks | expand |
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,
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,
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, >
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!
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,
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(-)