From patchwork Tue Jan 16 09:14:17 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 861344 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.138; helo=whitealder.osuosl.org; envelope-from=intel-wired-lan-bounces@osuosl.org; receiver=) Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zLPgs4KWTz9s83 for ; Tue, 16 Jan 2018 20:15:03 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 1AABE876F2; Tue, 16 Jan 2018 09:15:02 +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 wR2lEBWDm97r; Tue, 16 Jan 2018 09:15:01 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 1692F876F9; Tue, 16 Jan 2018 09:15:01 +0000 (UTC) X-Original-To: intel-wired-lan@lists.osuosl.org Delivered-To: intel-wired-lan@lists.osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 3749A1C0146 for ; Tue, 16 Jan 2018 09:14:59 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 57AB0863CD for ; Tue, 16 Jan 2018 09:14:58 +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 P3q02818Asks for ; Tue, 16 Jan 2018 09:14:54 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mout.kundenserver.de (mout.kundenserver.de [212.227.17.13]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 3725B8626E for ; Tue, 16 Jan 2018 09:14:53 +0000 (UTC) Received: from wuerfel.lan ([95.208.111.237]) by mrelayeu.kundenserver.de (mreue101 [212.227.15.145]) with ESMTPA (Nemesis) id 0MSrrB-1eRAgy2CDV-00RmU5; Tue, 16 Jan 2018 10:14:37 +0100 From: Arnd Bergmann To: Jeff Kirsher Date: Tue, 16 Jan 2018 10:14:17 +0100 Message-Id: <20180116091433.2535569-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:vhOul67BL7W/9lJzZTCEVjpVaNFqpCUUGWdWjqtqkTHWsrt2ZnJ m1uqYfFxe44oseqX2nrHZ0Qt/jAIPehgpLI8G/3Dc52ckBDAL/RuAwOccBG2XT3KvKXPtOT tlWHmGc1wfma226laYkvUAz5iAagpMw1zOzpdtc4R5jcPVvvWd4J9WDiYWczu6H3w56Q4p3 qao3/bS49nnIZosGqCb9g== X-UI-Out-Filterresults: notjunk:1; V01:K0:Jv4SlrkaYHo=:kCDtRNu+4whY9zKLFSr5ew qVVeTLes3A7RrkTHZtJ+at1IOC4O9iI+CP3MpShyZnqUZhIASBwYUO3C+EnAqXOvu/1f7tppV IvV1gcahLNIzRvM/SWF7KXR/axIgF9q8G8yEkIyukT5vvMakLWl08YLFo0RiTNWHAi6IB6lBx DHDYV17MoqDjpFtAbwwToDqYAuVq7lBhhIfrazgCoLgXJR6l4ptAnrqsGRF3OGn53yOCRfzBe zau6At8Bf9Tttv8B/50xtN4QYgmS6dYIFhdhlcPBPfqkM+67WTHe3DK41n1ZyEc9ZiEG8F9Ba t41fLGZppnOESS3Re+rGO3w2fevGI18susKucVOYFo7h+Y3k33wjFa6HYAq70rR0hH53oTD0k 3lBSgvSkoeJJujm5chSSirN3+bKI/VLL8kkYK5ucSARAGS1WhcTDuLvEyHH7nJBeyGRYl3MO0 jzaXnUkgK1B9+bXg/8f76TegrJeyRdGtXTAQ66kcSJ18yWOalaBWHqnW9J3r627lwr2YDm8zj 6ANW0BFJZYXX8mCbMqkjHZoFgXlpUXIHnFUwcMbjjs6zIIwZgxhOJNku1zw8x+lFZbsSpxTBm AqpOup0vnn07WSs7Xm8UySdCPu+4yQnVegcOVNTE80DNzy/NhCPZ6PxU2yLLEZWsIlokSp9Vs RNnX32ap+3sVqKWgBYjE/tB0z0V3AzFsEU24dz3RmjKdjPSuZ/KpEefdvmvyYKMIzTWGNfDMd M9KnrGghGW7gMvUsSPdXilzKiYhpRBdkSOs2Qg== Subject: [Intel-wired-lan] [PATCH] [RESEND net] fm10k: mark PM functions as __maybe_unused X-BeenThere: intel-wired-lan@osuosl.org X-Mailman-Version: 2.1.24 Precedence: list List-Id: Intel Wired Ethernet Linux Kernel Driver Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Arnd Bergmann , Ngai-Mint Kwan , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, intel-wired-lan@lists.osuosl.org, "David S. Miller" 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/fm10k/fm10k_pci.c:2502:12: error: 'fm10k_suspend' defined but not used [-Werror=unused-function] drivers/net/ethernet/intel/fm10k/fm10k_pci.c:2475:12: error: 'fm10k_resume' 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: 8249c47c6ba4 ("fm10k: use generic PM hooks instead of legacy PCIe power hooks") Acked-by: Jacob Keller Tested-by: Krishneil Singh Signed-off-by: Arnd Bergmann Acked-by: Jacob Keller --- Apparently nobody picked this up the first time around (Oct 2017), here is the same patch again. --- drivers/net/ethernet/intel/fm10k/fm10k_pci.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/drivers/net/ethernet/intel/fm10k/fm10k_pci.c b/drivers/net/ethernet/intel/fm10k/fm10k_pci.c index 7f605221a686..a434fecfdfeb 100644 --- a/drivers/net/ethernet/intel/fm10k/fm10k_pci.c +++ b/drivers/net/ethernet/intel/fm10k/fm10k_pci.c @@ -2463,7 +2463,6 @@ static int fm10k_handle_resume(struct fm10k_intfc *interface) return err; } -#ifdef CONFIG_PM /** * fm10k_resume - Generic PM resume hook * @dev: generic device structure @@ -2472,7 +2471,7 @@ static int fm10k_handle_resume(struct fm10k_intfc *interface) * suspend or hibernation. This function does not need to handle lower PCIe * device state as the stack takes care of that for us. **/ -static int fm10k_resume(struct device *dev) +static int __maybe_unused fm10k_resume(struct device *dev) { struct fm10k_intfc *interface = pci_get_drvdata(to_pci_dev(dev)); struct net_device *netdev = interface->netdev; @@ -2499,7 +2498,7 @@ static int fm10k_resume(struct device *dev) * system suspend or hibernation. This function does not need to handle lower * PCIe device state as the stack takes care of that for us. **/ -static int fm10k_suspend(struct device *dev) +static int __maybe_unused fm10k_suspend(struct device *dev) { struct fm10k_intfc *interface = pci_get_drvdata(to_pci_dev(dev)); struct net_device *netdev = interface->netdev; @@ -2511,8 +2510,6 @@ static int fm10k_suspend(struct device *dev) return 0; } -#endif /* CONFIG_PM */ - /** * fm10k_io_error_detected - called when PCI error is detected * @pdev: Pointer to PCI device @@ -2643,11 +2640,9 @@ static struct pci_driver fm10k_driver = { .id_table = fm10k_pci_tbl, .probe = fm10k_probe, .remove = fm10k_remove, -#ifdef CONFIG_PM .driver = { .pm = &fm10k_pm_ops, }, -#endif /* CONFIG_PM */ .sriov_configure = fm10k_iov_configure, .err_handler = &fm10k_err_handler };