From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E8E28C433DF for ; Fri, 5 Jun 2020 07:39:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id BE781207D0 for ; Fri, 5 Jun 2020 07:39:38 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="YBgjJpjO" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725280AbgFEHji (ORCPT ); Fri, 5 Jun 2020 03:39:38 -0400 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:31495 "EHLO us-smtp-delivery-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1725986AbgFEHji (ORCPT ); Fri, 5 Jun 2020 03:39:38 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1591342776; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=HhMc+d91L3zYiW99EmslarMDb7Iy+cphIwMBvcR3gAk=; b=YBgjJpjOWGCT0Owz3UB7/J615Wyx6tGhmrTopdIiK1ekbwmieDYxOxuBM8uAr74HOnb/S/ HvRp5Yg1CaDEZoQKTkCBjV36njkSUB4OrqC17fQRnB7MYPMvlkHXXtcGoHZGdQh3nHxzKA 4QTQT8yo//ki3OAOjEuqzle8QofAS28= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-280-MK3r3kGGPaK3OXCo4l8cfA-1; Fri, 05 Jun 2020 03:39:16 -0400 X-MC-Unique: MK3r3kGGPaK3OXCo4l8cfA-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 288031B18BC2; Fri, 5 Jun 2020 07:39:15 +0000 (UTC) Received: from gondolin (ovpn-113-2.ams2.redhat.com [10.36.113.2]) by smtp.corp.redhat.com (Postfix) with ESMTP id A31007B5F2; Fri, 5 Jun 2020 07:39:10 +0000 (UTC) Date: Fri, 5 Jun 2020 09:39:07 +0200 From: Cornelia Huck To: Halil Pasic , Heiko Carstens , Vasily Gorbik , Christian Borntraeger , "Michael S. Tsirkin" Cc: linux-s390@vger.kernel.org, virtualization@lists.linux-foundation.org, kvm@vger.kernel.org Subject: Re: [PATCH] s390/virtio: remove unused pm callbacks Message-ID: <20200605093907.4d4b3c2a.cohuck@redhat.com> In-Reply-To: <20200604234421.4ada966b.pasic@linux.ibm.com> References: <20200526093629.257649-1-cohuck@redhat.com> <20200604234421.4ada966b.pasic@linux.ibm.com> Organization: Red Hat GmbH MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org On Thu, 4 Jun 2020 23:44:21 +0200 Halil Pasic wrote: > On Tue, 26 May 2020 11:36:29 +0200 > Cornelia Huck 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 > > Reviewed-by: Halil Pasic 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, >