From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755861AbdKBLJs (ORCPT ); Thu, 2 Nov 2017 07:09:48 -0400 Received: from mout.kundenserver.de ([217.72.192.74]:61691 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755842AbdKBLJp (ORCPT ); Thu, 2 Nov 2017 07:09:45 -0400 From: Arnd Bergmann To: Kalle Valo Cc: Arnd Bergmann , Ryan Hsu , Govind Singh , Srinivas Kandagatla , Ashok Raj Nagarajan , Ben Greear , Brian Norris , Colin Ian King , ath10k@lists.infradead.org, linux-wireless@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] ath10k: move pci suspend/resume functions Date: Thu, 2 Nov 2017 12:08:53 +0100 Message-Id: <20171102110903.2886660-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:KRinh/Ctkc9Qa3fJoQtPt8H3Kmj8feCkxXPI3+unK2vh2rTU8ss GYyZP8kPnfU2t9j5GjOyA8imm9p+ZPgxgaKpNexSFQZy+ueEBfFLkMCy+NTzU/YeJ14RAg5 Rfv1XM6L8qTmbZCqdXjI+jR23gYPkaijTRBMETmxQmGtS9QHB+cQPl8R+CBNaE9y9S8zD5h SSziXqTWvCOCy8xPE7XcQ== X-UI-Out-Filterresults: notjunk:1;V01:K0:TOiLmo1QlxE=:umwTVvE5kMtq6+aK+7Hyll URUmC4qZsITzYALS6hQZrKMNREQvpYLzARZHzuiBYhaMrrD3xoF4gOUz9cwwsfj1Hj5rYEnFm i9Pi2wMD+FFitxjPK/VlN42elBumWktE98g036ipD/eZG0dgb6OZBIMFPGFAYqNXHjPHxgayW tbx8DLNJLMOJfBBjKRRzDQ4dAz1uHVS7m0g4ARnqszU6IbKnnXL0UR7q6f5nqXy8f2VvrizxQ 8mS9DWxOtIR1yxWqnWEf8DvfgHeskWyRCnUBjR9xaH4WhJF1bYnlLgBFPcCZj76N3FHTnZjaJ eAXF3S63m86T/ccXXlm1/X6O4Zp1mkr2P+aMvQuFMvHXlAUvRPUqykF/CMiNPB35WGHc8mzUL H8C+7yYaXs36AxbqlreNr8X9CM0FZPIM4yu7UW6gOdx3zzmlKoD1cnkt20lzEWPAURsMD1KnN erA41+2YGwMwOktn2XDyskoaUTuLCg+tJBqAD9BW2hooFemJXWx8pwtKm/cbGUSRbf2zYRK1K F4zfM7KCubCZT01RKDxXHnr1cM2ajTSNiKVmxvKqYYwIx2e8zmSvDG+s12sR2tqvqe1krBQGu CkmdH/vuk8XGGOGyNPedhi7nT9Lxlejd8y3nJDMvnDfhUpXW/LfFMz2UamkXdjrNG6nCzb5C4 no1rNzGfUIJiYTaMOHkFZilSlT1AN/YURAhBJiwEl9chY/5YG+XQLy3v/UclQCEY2f0r1O4pg Ue5fIFDrHItCA6q2ThNmQvTPPlSlE27qlsQqeQ== Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The combination of two patches has led to a build failure: drivers/net/wireless/ath/ath10k/pci.c: In function 'ath10k_pci_pm_suspend': drivers/net/wireless/ath/ath10k/pci.c:3416:8: error: implicit declaration of function 'ath10k_pci_suspend'; did you mean 'ath10k_pci_pm_suspend'? [-Werror=implicit-function-declaration] drivers/net/wireless/ath/ath10k/pci.c: In function 'ath10k_pci_pm_resume': drivers/net/wireless/ath/ath10k/pci.c:3428:8: error: implicit declaration of function 'ath10k_pci_resume'; did you mean 'ath10k_pci_pm_resume'? [-Werror=implicit-function-declaration] This moves the functions outside of the now incorrect #ifdef. Fixes: 96378bd2c6cd ("ath10k: fix core PCI suspend when WoWLAN is supported but disabled") Fixes: 6af1de2e4ec4 ("ath10k: mark PM functions as __maybe_unused") Signed-off-by: Arnd Bergmann --- drivers/net/wireless/ath/ath10k/pci.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/net/wireless/ath/ath10k/pci.c b/drivers/net/wireless/ath/ath10k/pci.c index b18a9b690df4..6513edbd86e6 100644 --- a/drivers/net/wireless/ath/ath10k/pci.c +++ b/drivers/net/wireless/ath/ath10k/pci.c @@ -2585,6 +2585,13 @@ static int ath10k_pci_hif_suspend(struct ath10k *ar) return 0; } +static int ath10k_pci_hif_resume(struct ath10k *ar) +{ + /* Nothing to do; the important stuff is in the driver resume. */ + return 0; +} +#endif + static int ath10k_pci_suspend(struct ath10k *ar) { /* The grace timer can still be counting down and ar->ps_awake be true. @@ -2597,12 +2604,6 @@ static int ath10k_pci_suspend(struct ath10k *ar) return 0; } -static int ath10k_pci_hif_resume(struct ath10k *ar) -{ - /* Nothing to do; the important stuff is in the driver resume. */ - return 0; -} - static int ath10k_pci_resume(struct ath10k *ar) { struct ath10k_pci *ar_pci = ath10k_pci_priv(ar); @@ -2627,7 +2628,6 @@ static int ath10k_pci_resume(struct ath10k *ar) return ret; } -#endif static bool ath10k_pci_validate_cal(void *data, size_t size) { -- 2.9.0