From patchwork Tue Aug 1 10:58:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 129234 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:918b:0:b0:3e4:2afc:c1 with SMTP id s11csp2614618vqg; Tue, 1 Aug 2023 04:58:47 -0700 (PDT) X-Google-Smtp-Source: APBJJlH6RnPYBt1Nz0pksqTxfJs+HVflNj2d4UkwNnaeYSUk/je3pzjgdzVLAWdbQuQKFDefUGpY X-Received: by 2002:a17:90a:d515:b0:268:dd0:3495 with SMTP id t21-20020a17090ad51500b002680dd03495mr11099465pju.42.1690891127549; Tue, 01 Aug 2023 04:58:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690891127; cv=none; d=google.com; s=arc-20160816; b=s5t/J/t15RPe7N4vMI/qnUiK3axbS8tV1W5LSWliHBN64HlsLUXWDou90ASKT7wkL5 tPBpC9sIUvoi6yVX7Nym7WRsT0DJg3RbXmX1Ksrd2QwnE9xDSovJSf8NzDHiA4KRgHRS xtW24JwKNxxkM/AmFMXdL90Gb12HpP9eQ98G2693w1S5VepMAK8ypt9BEsbVcoU1xIgd itzyteQc5bJtQ/nOxKvTEXUNjEAyzyFnbpdEGTDrCAnaIF++G5zmhSXRj6B0MnPRfIJ6 kUjqPFsyQGZ+UgLosxAIjpkR6b/fkIzl8/lOC41Sk89o8W1NJmfS8xpuP5sZxKSj/4SF J+dg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=xGaERZ2cS9xPp3kOEJITglX80b0666WQuat3mDqdxbc=; fh=9RFIAdkhwRN9qINKVzoV62LmI6NKZWo6qvolrMVCyAw=; b=txHaEO2wlUI5XypiFQW3p/cMU4xbtGe4IxcXwUb1NDPBf64/vVCg06pUgdsjZ/XC17 vhY2vLc5MB9888TgdfMKmxLV6Xoy/1sC6Seh5k5FAdqsyr80IgY7skbeTzLGErVckKPR 5jk7Lp86gd0HdIHTnj1ayCcxBR+fWTl9HAN8sFE+v3Vv20GUg8afVxXr+txuOX75alzq ob6gbYJk9XqKTtUdbipYudUpM2RQ/4QQNk9H9iIwlV+3R3nys5wxzrWK2oFvN79xkUHQ l/UOSz//to/EcSNDgUFxA+Xhkw03oelsD5fRZ7xsGvEkL+frQF0jkcO3jxMbvfj4SGv+ 8RRg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=BsLJsuBk; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id v10-20020a17090abb8a00b00267a487f014si10616008pjr.167.2023.08.01.04.58.35; Tue, 01 Aug 2023 04:58:47 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=BsLJsuBk; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231637AbjHALFY (ORCPT + 99 others); Tue, 1 Aug 2023 07:05:24 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44300 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230086AbjHALEy (ORCPT ); Tue, 1 Aug 2023 07:04:54 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DE391526E for ; Tue, 1 Aug 2023 03:58:55 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 729016150F for ; Tue, 1 Aug 2023 10:58:55 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 48116C433C8; Tue, 1 Aug 2023 10:58:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1690887534; bh=5JszLrVl14NYpDg2t9eZAPFv3d27caE8ile05br6iwY=; h=From:To:Cc:Subject:Date:From; b=BsLJsuBkZ7IsGXvQVTLM0rvXkIdYf1Us6CNONmRdUlJjziGHzVaKyaNjcmw6UrTGw NvVBbySJItFMnTZtVTjTbG7WKmEz1o7RJOtjZJ2E2KsnsYXG9T4wgtNrqMi4s7M3il 5THtfTQy6xZo0vvD5XU7kP3l/F7TpPqL6CN2uxkPbnYTRNha0UqHkusRWVTbAILmmj 5R/OEz8vVDSD7qkJjYDZp6nra2WnSxiLGomD5CHZhtu8mFDeWg3u/46sV+laiw+/zm 3ZI5sGQts4BitwYQdEIGX//WGQhwy81EoShB481+Sys17qA42K8wEZZ5yM9GhoEbYD 3liyT1RnICCnQ== From: Arnd Bergmann To: Andi Shyti Cc: Arnd Bergmann , "Michael S. Tsirkin" , Jason Wang , Xuan Zhuo , Stefano Garzarella , Christophe JAILLET , Feng Liu , Viresh Kumar , Paul Cercueil , Jonathan Cameron , virtualization@lists.linux-foundation.org, linux-kernel@vger.kernel.org Subject: [PATCH] virtio: Remove PM #ifdef guards to fix i2c driver Date: Tue, 1 Aug 2023 12:58:15 +0200 Message-Id: <20230801105846.3708252-1-arnd@kernel.org> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF, RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1773027854892835673 X-GMAIL-MSGID: 1773027854892835673 From: Arnd Bergmann A cleanup in the virtio i2c caused a build failure: drivers/i2c/busses/i2c-virtio.c:270:10: error: 'struct virtio_driver' has no member named 'freeze' drivers/i2c/busses/i2c-virtio.c:271:10: error: 'struct virtio_driver' has no member named 'restore' Change the structure definition to allow this cleanup to be applied everywhere. Fixes: 73d546c76235b ("i2c: virtio: Remove #ifdef guards for PM related functions") Signed-off-by: Arnd Bergmann Reviewed-by: Andi Shyti Reviewed-by: Paul Cercueil --- include/linux/virtio.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/include/linux/virtio.h b/include/linux/virtio.h index 0f3b9017dff40..9b94e2c9bbb81 100644 --- a/include/linux/virtio.h +++ b/include/linux/virtio.h @@ -218,10 +218,8 @@ struct virtio_driver { void (*scan)(struct virtio_device *dev); void (*remove)(struct virtio_device *dev); void (*config_changed)(struct virtio_device *dev); -#ifdef CONFIG_PM int (*freeze)(struct virtio_device *dev); int (*restore)(struct virtio_device *dev); -#endif }; static inline struct virtio_driver *drv_to_virtio(struct device_driver *drv)