From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:41432 "EHLO us-smtp-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1725275AbgFCGoE (ORCPT ); Wed, 3 Jun 2020 02:44:04 -0400 Date: Wed, 3 Jun 2020 08:43:56 +0200 From: Cornelia Huck Subject: Re: [PATCH] s390/virtio: remove unused pm callbacks Message-ID: <20200603084356.326d66aa.cohuck@redhat.com> In-Reply-To: <20200526093629.257649-1-cohuck@redhat.com> References: <20200526093629.257649-1-cohuck@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-s390-owner@vger.kernel.org List-ID: To: Halil Pasic Cc: linux-s390@vger.kernel.org, virtualization@lists.linux-foundation.org, kvm@vger.kernel.org Friendly ping. On Tue, 26 May 2020 11:36:29 +0200 Cornelia Huck 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 > --- > 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,