From patchwork Tue Jul 25 15:35:50 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 108656 Delivered-To: patch@linaro.org Received: by 10.140.101.44 with SMTP id t41csp708425qge; Tue, 25 Jul 2017 08:36:29 -0700 (PDT) X-Received: by 10.99.95.79 with SMTP id t76mr19419586pgb.141.1500996989481; Tue, 25 Jul 2017 08:36:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1500996989; cv=none; d=google.com; s=arc-20160816; b=U5T1pup8oi2PeDECQZuanOdPrikTavsLGvi10DjAzKXk5JJgjv5zZ2H6fYLvm3j2MW kwiyHPJ+CexWJl0CAP3KqsIVOnb9MiNGnipEDUIsWpF8j29deZ5oy1tDavs8IwMm/go8 cR9GGw7U3dcmD9hBPROONYL8kSAGB9cIDKiz1sxRMX+qjzfHZxWi0zlqU7r7tloe0VoY 3mIYgFPo5FS5MdLJkOpT6UxrgblOTLT/gpgS00sLI9aCSzkDzf7Sda5JDgbHC7739q1v D4NfKjNZlSidDwRB9VlSV2fbMWqsvTlyA9mrVlF5w37tpoj0Ezfgmt8k/tbIBrEI6Z+D GNjA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :arc-authentication-results; bh=BMTHW4Yp1MM4kCZXk1USJFzcIu9U/X+xIw37/PXFrMs=; b=1F9TJ1zs0cD8w1cFWjwxUThQM+pL2Qy9EAJfK+oBA+3l74Dt+UQE52dbMFwXEZxcbN iPu9hkqVGWcOXTKQCPoQxfcGP1zxAg94EpMpzGgYcrfOptmq49i3bdHD8pkd9/kHEvZw dnVpaUG0tQlE7URVIoYnB01kdKWfX3GUfsvQ3iMlXgr1yoAKFR+ckgfFvt+QjcPtW4Hs 7wy/SjmgggbRkh4sTuBF6rPWfAD+7mA694mB4rZp3+AzwLoQf1MvtKOaNMcmJSrQDMVd anAv7AYXKAsOHUUIb7P0tZm3zLUD9M86gAjbPo0YXWN7wLqUT8JycKaCL3dvWLVWyESS Gjew== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id z59si2554709plh.873.2017.07.25.08.36.26; Tue, 25 Jul 2017 08:36:29 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752466AbdGYPgX (ORCPT + 26 others); Tue, 25 Jul 2017 11:36:23 -0400 Received: from mout.kundenserver.de ([212.227.17.24]:56105 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752144AbdGYPgW (ORCPT ); Tue, 25 Jul 2017 11:36:22 -0400 Received: from wuerfel.lan ([5.56.224.194]) by mrelayeu.kundenserver.de (mreue103 [212.227.15.145]) with ESMTPA (Nemesis) id 0LrqDW-1djQ541UdC-013cpf; Tue, 25 Jul 2017 17:36:04 +0200 From: Arnd Bergmann To: "Michael S. Tsirkin" , Jason Wang Cc: Arnd Bergmann , "David S. Miller" , John Fastabend , Willem de Bruijn , Sebastian Andrzej Siewior , Eric Dumazet , virtualization@lists.linux-foundation.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH net-next] virtio-net: mark PM functions as __maybe_unused Date: Tue, 25 Jul 2017 17:35:50 +0200 Message-Id: <20170725153600.211694-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:zpolVLVMH8tFj+znuwJgI32aaXLC/s0fis483msMLyvXOONhi+f jYAcbNa5CBuHtxd+6DYLDzobspDEGL+stTLH5vLUQmzgITRFpXZEbUgnZjgRsann0PH1NCL bz4wTxDk2NH9dXsUPzh4MhtNZ8X3cr/rGsTqepRN+cEy4Egf6zW3uXeLKdTmQkwu5GPbmVd QffExQZS4aeMajHAlGlZw== X-UI-Out-Filterresults: notjunk:1; V01:K0:+3fx+88yfJQ=:YYWhMP4YZ6DCVEdI1FFgsU y5N0dKCEXzVlCEapdfqst3fSKLiN873aXNpvcIHsjR0pTIgR46zQDDfvAotNm1bB8pk9rM+43 qKq9ii8ZCFtPo4nfg1MNvSTLfdeZpwTwS+fTRoGQT+qKRF61LAtaIyIiKTh7ryPYrLQZcwVBM gcSM5cjw48Pky77ONnrE0MJZgWOJj0OuQ8OqcgBPGLUmlwR9F8ha0lXn2+pOdRUGeUwJIQ1Fc HviqPdBYq1HmPTLIIJOzuVDrn2Va5+GDBsE+fyvd6sslEd169C2l7zscFxOHiC1cET7TILrnR lvDymegVoBtpBXhLkhgPCEkelh9fdW7aTP5ZhSjlTR0b61RYt4TJKhVNAXO2B5dfRVxuY8J08 w0yQCJl+3Jtnw18JFgl4vg9uuMsVWh2EXU87HwYp9ES7kbE+YPcmLc8Xc8w91PVuC/CaA1AZU Vg7ij5PjTcoF0tqrRARtYzTkZjwMdNbnc73JK5YQWtV+jNFjE7avoQsX8198yM8uE0ttQGbLp GTGcsz16LKOM7rG9xa1y/vh1DsupLaaKe4ixCQggAO3+qa0G2m05tq5YyfPAClGBXPJ9SaI7H kKnNxWooS8GJClKGZCfNB6UpHCthvHPepmC7C9aZuZwYSza+hVlSOppZ/usGMH2+IMpAT4+0v 7b26HGIuks0b2l8yG/aWJAvT2SAjugmBTiDVdpzjvx6RSF0qvjdnUP+zNME/MzVGv4KY0j2Nu y7HRuasXWOTFyWstvl82Zc2gK+VfWUWDzjL8+A== Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org After removing the reset function, the freeze and restore functions are now unused when CONFIG_PM_SLEEP is disabled: drivers/net/virtio_net.c:1881:12: error: 'virtnet_restore_up' defined but not used [-Werror=unused-function] static int virtnet_restore_up(struct virtio_device *vdev) drivers/net/virtio_net.c:1859:13: error: 'virtnet_freeze_down' defined but not used [-Werror=unused-function] static void virtnet_freeze_down(struct virtio_device *vdev) A more robust way to do this is to remove the #ifdef around the callers and instead mark them as __maybe_unused. The compiler will now just silently drop the unused code. Fixes: 4941d472bf95 ("virtio-net: do not reset during XDP set") Signed-off-by: Arnd Bergmann --- drivers/net/virtio_net.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) -- 2.9.0 Acked-by: Jason Wang diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c index d4751ce23b4f..1902701e15a9 100644 --- a/drivers/net/virtio_net.c +++ b/drivers/net/virtio_net.c @@ -2702,8 +2702,7 @@ static void virtnet_remove(struct virtio_device *vdev) free_netdev(vi->dev); } -#ifdef CONFIG_PM_SLEEP -static int virtnet_freeze(struct virtio_device *vdev) +static __maybe_unused int virtnet_freeze(struct virtio_device *vdev) { struct virtnet_info *vi = vdev->priv; @@ -2714,7 +2713,7 @@ static int virtnet_freeze(struct virtio_device *vdev) return 0; } -static int virtnet_restore(struct virtio_device *vdev) +static __maybe_unused int virtnet_restore(struct virtio_device *vdev) { struct virtnet_info *vi = vdev->priv; int err; @@ -2730,7 +2729,6 @@ static int virtnet_restore(struct virtio_device *vdev) return 0; } -#endif static struct virtio_device_id id_table[] = { { VIRTIO_ID_NET, VIRTIO_DEV_ANY_ID },