From patchwork Thu Nov 2 11:08:53 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 10038461 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id B8D7E60291 for ; Thu, 2 Nov 2017 11:09:57 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AC1A7285F5 for ; Thu, 2 Nov 2017 11:09:57 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A072B28809; Thu, 2 Nov 2017 11:09:57 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_MED autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 3FA9428F01 for ; Thu, 2 Nov 2017 11:09:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To: References:List-Owner; bh=Ah8ej88h53nIclB5Qnvo+o2gHCoTLU+VJlYaYj8vil4=; b=WKP qBQgVixyITfRbYL0guMNZuxWXfzt4zNwFCwfwGs9duCatMr/cnbyo5+bFBBe/b6JpHOjiUr3Wwar1 dSxla7XAiXAFRDpoSJ3htYUqYDC8FWX4QB96OPNAAvxyAgk5H64kI6zh6CwVxtS5QrFiLjnyeE0Il s0n1GLNYitgvIEAYR32ujTJyaTMpPkSAyQ5RikJKKsQ6vlWlVDGKkBXBM05RYLLqG+0gHh2MWwlHZ syZaPekcaVliziEOWiSmUglt4TPUMim+ngtwhmt2pBDLK2o+eVubX40b359eg/O6GRsihVaYFNE5U 1Tr4OZil1u6iywphXykx5jmAGv0TvLw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1eADNZ-0003KL-86; Thu, 02 Nov 2017 11:09:45 +0000 Received: from mout.kundenserver.de ([217.72.192.74]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1eADNU-0003Ha-7Y for ath10k@lists.infradead.org; Thu, 02 Nov 2017 11:09:43 +0000 Received: from wuerfel.lan ([109.193.157.232]) by mrelayeu.kundenserver.de (mreue102 [212.227.15.145]) with ESMTPA (Nemesis) id 0LZvn3-1dRCzH3BRF-00lpB8; Thu, 02 Nov 2017 12:09:06 +0100 From: Arnd Bergmann To: Kalle Valo 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== X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20171102_040940_620202_D3D29B3A X-CRM114-Status: GOOD ( 10.00 ) X-BeenThere: ath10k@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Govind Singh , Ryan Hsu , Arnd Bergmann , netdev@vger.kernel.org, Brian Norris , linux-wireless@vger.kernel.org, linux-kernel@vger.kernel.org, ath10k@lists.infradead.org, Srinivas Kandagatla , Colin Ian King , Ben Greear , Ashok Raj Nagarajan MIME-Version: 1.0 Sender: "ath10k" Errors-To: ath10k-bounces+patchwork-ath10k=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP 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) {