From patchwork Tue Nov 8 13:37:32 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 101566 Delivered-To: patch@linaro.org Received: by 10.140.97.165 with SMTP id m34csp1552149qge; Tue, 8 Nov 2016 05:38:32 -0800 (PST) X-Received: by 10.99.155.26 with SMTP id r26mr18896727pgd.165.1478612312892; Tue, 08 Nov 2016 05:38:32 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id q17si36948632pfk.223.2016.11.08.05.38.32; Tue, 08 Nov 2016 05:38:32 -0800 (PST) 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 S1752419AbcKHNi3 (ORCPT + 27 others); Tue, 8 Nov 2016 08:38:29 -0500 Received: from mout.kundenserver.de ([212.227.126.135]:53217 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751704AbcKHNi1 (ORCPT ); Tue, 8 Nov 2016 08:38:27 -0500 Received: from wuerfel.lan. ([78.43.20.153]) by mrelayeu.kundenserver.de (mreue002) with ESMTPA (Nemesis) id 0M31zr-1cw4IT0GEZ-00sue6; Tue, 08 Nov 2016 14:38:06 +0100 From: Arnd Bergmann To: Tom Lendacky Cc: Arnd Bergmann , "David S. Miller" , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [net-next PATCH] amd-xgbe: use __maybe_unused to hide pm functions Date: Tue, 8 Nov 2016 14:37:32 +0100 Message-Id: <20161108133802.1716319-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:KdjJPqDvEelV5cvuDUl2y2LbbopbE2uVyO45s3I9NtkGBVbGw2f WiVHh/8G5ijdwcr6JwCEaNaoOtQDCLDNyGJY18XdTCLBQzGvyL3Uu2IbDWUaDcFHVRjnQcI XyG0jcy1sPMTu9GPaCVyYW3TyNmsdqChhnhRcn4mLnHOhM6rdyWsuMIduXlc2DsSFHPhrvb z+C/MTa09AFxvPP3a0+Lg== X-UI-Out-Filterresults: notjunk:1; V01:K0:/3kUoLXSkQA=:zEQHD/gcRapnUFnpWFfyY+ jpsKBDQ82Dm5CdPgLrIANvJNPHWmZ1pyRqBJI/kZEs9RAI2f1qWei7ePV+7i4dr+ChX1nZ8u9 F9v5qiqOLA7WCbL2n5RM6venUqsylqBAz32q6nQ9tlS3tMN99YY9/5wCjQIaHdzeGve4QfRIw O/6crFlZ+485yHRnyy36T4YHazAAuo2XJkvQOe+Zxc0UyoLZ/G1YYna+iIo8SOFHjVdXj1U28 yHOcgbPpLQPDpQOroKs1SB33DW5SKJVgLrsNmZzySuqRl7663cDRQ2hHYyO6oHERPPIFel+Gd ui90FIiYtJ9XQpCb+RHcEp7P7ORXKmT1sTuIXYHp7EER3IUoPa4cvNe+uVnRY+pxCAyOlln3C kjb5k6LyHFwXGoHvYlpeSl/Y1PBuj8rI8P0NZcslHgkeMGKhcvanRpsi/4GkVf2KWiTXMwxyP qfWhOkp+JIZp9KFGJyAvjDz8VfvFWh7Chp6h4SEzt/NyDtlPdjtMr25rtvOtcNOTszvwfCSEe tA380WBOweQwJ1ZBahRlqp/GRAvzShZMWd9jDub2QGWm4t4Hl9bOQx8aSIGji8slXD+/7RLod V1YDgaS2ijn2PnK33WQtNFqKyFFuBejKkWW2JX0Jhbp2JEREBCFfsV6NJmYLWi0wNa3zDlK9i 2hlDHs9FGpYqUxyzDlyaLpp42PO9Ccp+gvNYJy7mZ+8vsXdk32Vmqzconv/YbRKcqDt8= Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The amd-xgbe ethernet driver hides its suspend/resume functions in #ifdef CONFIG_PM, but uses SIMPLE_DEV_PM_OPS() to make the reference conditional on CONFIG_PM_SLEEP, which results in a warning when PM_SLEEP is not set but PM is: drivers/net/ethernet/amd/xgbe/xgbe-platform.c:553:12: error: 'xgbe_platform_resume' defined but not used [-Werror=unused-function] drivers/net/ethernet/amd/xgbe/xgbe-platform.c:533:12: error: 'xgbe_platform_suspend' defined but not used [-Werror=unused-function] This removes the incorrect #ifdef and instead uses a __maybe_unused annotation to let the compiler know it can silently drop the function definition. Fixes: bd8255d8ba35 ("amd-xgbe: Prepare for supporting PCI devices") Signed-off-by: Arnd Bergmann --- I originally submitted this when in March 2016, but the patch has not yet made it upstream, and the file contents have moved around so the old patch no longer applied so I'm resending the rebased version now. --- drivers/net/ethernet/amd/xgbe/xgbe-platform.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) -- 2.9.0 diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-platform.c b/drivers/net/ethernet/amd/xgbe/xgbe-platform.c index 0edbcd523f8f..02daca817bb7 100644 --- a/drivers/net/ethernet/amd/xgbe/xgbe-platform.c +++ b/drivers/net/ethernet/amd/xgbe/xgbe-platform.c @@ -529,8 +529,7 @@ static int xgbe_platform_remove(struct platform_device *pdev) return 0; } -#ifdef CONFIG_PM -static int xgbe_platform_suspend(struct device *dev) +static int __maybe_unused xgbe_platform_suspend(struct device *dev) { struct xgbe_prv_data *pdata = dev_get_drvdata(dev); struct net_device *netdev = pdata->netdev; @@ -550,7 +549,7 @@ static int xgbe_platform_suspend(struct device *dev) return ret; } -static int xgbe_platform_resume(struct device *dev) +static int __maybe_unused xgbe_platform_resume(struct device *dev) { struct xgbe_prv_data *pdata = dev_get_drvdata(dev); struct net_device *netdev = pdata->netdev; @@ -574,7 +573,6 @@ static int xgbe_platform_resume(struct device *dev) return ret; } -#endif /* CONFIG_PM */ static const struct xgbe_version_data xgbe_v1 = { .init_function_ptrs_phy_impl = xgbe_init_function_ptrs_phy_v1,