From patchwork Tue Oct 10 08:17:38 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 823743 X-Patchwork-Delegate: jeffrey.t.kirsher@intel.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=osuosl.org (client-ip=140.211.166.137; helo=fraxinus.osuosl.org; envelope-from=intel-wired-lan-bounces@osuosl.org; receiver=) Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3yB94k0L2Yz9tXl for ; Tue, 10 Oct 2017 19:19:17 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 32E6387B68; Tue, 10 Oct 2017 08:19:16 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 0JOwXW37vunN; Tue, 10 Oct 2017 08:19:14 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id BF5FF879F8; Tue, 10 Oct 2017 08:19:14 +0000 (UTC) X-Original-To: intel-wired-lan@lists.osuosl.org Delivered-To: intel-wired-lan@lists.osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 51F561BFC90 for ; Tue, 10 Oct 2017 08:19:13 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 4867987062 for ; Tue, 10 Oct 2017 08:19:13 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id jTbcv-Wgghqz for ; Tue, 10 Oct 2017 08:19:12 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mout.kundenserver.de (mout.kundenserver.de [212.227.126.134]) by whitealder.osuosl.org (Postfix) with ESMTPS id E24FB86E9C for ; Tue, 10 Oct 2017 08:19:11 +0000 (UTC) Received: from wuerfel.lan ([95.208.190.237]) by mrelayeu.kundenserver.de (mreue004 [212.227.15.129]) with ESMTPA (Nemesis) id 0MWvbc-1dneuZ3Mc0-00VxXi; Tue, 10 Oct 2017 10:18:55 +0200 From: Arnd Bergmann To: Jeff Kirsher Date: Tue, 10 Oct 2017 10:17:38 +0200 Message-Id: <20171010081847.4090496-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:8k8t1khesu7P762HJpMxbrZckQaC0ufQa0x1cSh5/DPuPSz+nuM tFsbHiXiXBT74y+F4bNmQOBY7kPUdw/0SDqInJBsxsOAZu8MxMUjRGRxG7M2HDV0Swj/ckR IG4WdLqIruvzAtAmhA9K7bwTOlzdjir47rniG1ZMOj9Zs+x1lEMpq2iKoLlJ9/hA9dghVQU 6u+UN00pQNc7x4aB5Zoig== X-UI-Out-Filterresults: notjunk:1; V01:K0:Mg7ZTLIu2Nw=:+gLyWUvSNgtujaGgQqFPeA KcpgzRMpUKRnVLMufE1KN/tmPfD2ypSbuYBw2LcZS+J0YQFJ0oOBttexoDvMVWFTyQhGsZD3F PsIEvfFKiIPNdZ6NmYIaRTRBcVYmmReYGdoThJJN39r9TPGpgZ61iNnGZ0LPaFqi7yAdtQRj/ S4mDf34K3K3GGltPvetSIffug+Ju/5LMlHqd15O3fqC8mfUrWFGuwmcT6ir/Cl9fI9LbfczKy 9MevkYtmDOfuTcBtpidfzZf2l2GpIqwp7FhbS71DWE0zEoHTEb7BPv4Kivg5VrUHw0MylX6dt FEn4bEt57fstbmu8xrHgVbxgUrjCwUe0teh9I5S1UAmZ1tFKarzwoYReyv8DbLL39k0TtxKen pGLeLjyAZLlEWREEI9MQ9KHntdVJE1LBtMtBm+x4oreGtpqbWNNtWz8Mxuk5QlNQW7O8+5fP3 O2HYLwhhCCM+PzVl7/1dl/3JWJkpHKfOzuuB6+6AygGzvyiZecnS0UaBjFs4UKueA74F/h7Hd diy/rut4vcPKHJvLyMGMYsbT+PWZTtJXtTeyrpVPdTKWVY7ua1KgVhTJ0DPXTsgSwVr2V5no4 EylEM1Cx8T2ZVUrClbaCWZX24o87daixsW85Pjg6pEzlVEnvqRklONTKGixp5Nvnfm4cs7WKj G+AaBMQddqLw+bYi7faAGrMjNBUmDrEsuS3PgI5R2KJffDTeIoliCiHYKLUaPsquXl2atlmAe gKB1wIlNSsPZvrt9vrSFscoeoRYds4y0YCAk0A== Cc: Arnd Bergmann , netdev@vger.kernel.org, Mitch Williams , linux-kernel@vger.kernel.org, intel-wired-lan@lists.osuosl.org, "David S. Miller" Subject: [Intel-wired-lan] [PATCH] i40e: mark PM functions as __maybe_unused X-BeenThere: intel-wired-lan@osuosl.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Intel Wired Ethernet Linux Kernel Driver Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: intel-wired-lan-bounces@osuosl.org Sender: "Intel-wired-lan" A cleanup of the PM code left an incorrect #ifdef in place, leading to a harmless build warning: drivers/net/ethernet/intel/i40e/i40e_main.c:12223:12: error: 'i40e_resume' defined but not used [-Werror=unused-function] drivers/net/ethernet/intel/i40e/i40e_main.c:12185:12: error: 'i40e_suspend' defined but not used [-Werror=unused-function] It's easier to use __maybe_unused attributes here, since you can't pick the wrong one. Fixes: 0e5d3da40055 ("i40e: use newer generic PM support instead of legacy PM callbacks") Signed-off-by: Arnd Bergmann Tested-by: Andrew Bowers Acked-by: Jacob Keller --- drivers/net/ethernet/intel/i40e/i40e_main.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c index 60b11fdeca2d..eb091268bc3c 100644 --- a/drivers/net/ethernet/intel/i40e/i40e_main.c +++ b/drivers/net/ethernet/intel/i40e/i40e_main.c @@ -8370,7 +8370,6 @@ static int i40e_init_interrupt_scheme(struct i40e_pf *pf) return 0; } -#ifdef CONFIG_PM /** * i40e_restore_interrupt_scheme - Restore the interrupt scheme * @pf: private board data structure @@ -8419,7 +8418,6 @@ static int i40e_restore_interrupt_scheme(struct i40e_pf *pf) return err; } -#endif /* CONFIG_PM */ /** * i40e_setup_misc_vector - Setup the misc vector to handle non queue events @@ -12177,12 +12175,11 @@ static void i40e_shutdown(struct pci_dev *pdev) } } -#ifdef CONFIG_PM /** * i40e_suspend - PM callback for moving to D3 * @dev: generic device information structure **/ -static int i40e_suspend(struct device *dev) +static int __maybe_unused i40e_suspend(struct device *dev) { struct pci_dev *pdev = to_pci_dev(dev); struct i40e_pf *pf = pci_get_drvdata(pdev); @@ -12220,7 +12217,7 @@ static int i40e_suspend(struct device *dev) * i40e_resume - PM callback for waking up from D3 * @dev: generic device information structure **/ -static int i40e_resume(struct device *dev) +static int __maybe_unused i40e_resume(struct device *dev) { struct pci_dev *pdev = to_pci_dev(dev); struct i40e_pf *pf = pci_get_drvdata(pdev); @@ -12252,8 +12249,6 @@ static int i40e_resume(struct device *dev) return 0; } -#endif /* CONFIG_PM */ - static const struct pci_error_handlers i40e_err_handler = { .error_detected = i40e_pci_error_detected, .slot_reset = i40e_pci_error_slot_reset, @@ -12269,11 +12264,9 @@ static struct pci_driver i40e_driver = { .id_table = i40e_pci_tbl, .probe = i40e_probe, .remove = i40e_remove, -#ifdef CONFIG_PM .driver = { .pm = &i40e_pm_ops, }, -#endif /* CONFIG_PM */ .shutdown = i40e_shutdown, .err_handler = &i40e_err_handler, .sriov_configure = i40e_pci_sriov_configure,