* [PATCH] ath10k: move pci suspend/resume functions
@ 2017-11-02 11:08 Arnd Bergmann
[not found] ` <20171102110903.2886660-1-arnd-r2nGTMty4D4@public.gmane.org>
0 siblings, 1 reply; 4+ messages in thread
From: Arnd Bergmann @ 2017-11-02 11:08 UTC (permalink / raw)
To: Kalle Valo
Cc: Arnd Bergmann, Ryan Hsu, Govind Singh, Srinivas Kandagatla,
Ashok Raj Nagarajan, Ben Greear, Brian Norris, Colin Ian King,
ath10k, linux-wireless, netdev, linux-kernel
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 <arnd@arndb•de>
---
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
^ permalink raw reply related [flat|nested] 4+ messages in thread[parent not found: <20171102110903.2886660-1-arnd-r2nGTMty4D4@public.gmane.org>]
* Re: [PATCH] ath10k: move pci suspend/resume functions [not found] ` <20171102110903.2886660-1-arnd-r2nGTMty4D4@public.gmane.org> @ 2017-11-02 15:23 ` Kalle Valo 2017-11-02 15:40 ` Arnd Bergmann 0 siblings, 1 reply; 4+ messages in thread From: Kalle Valo @ 2017-11-02 15:23 UTC (permalink / raw) To: Arnd Bergmann Cc: Ryan Hsu, Govind Singh, Srinivas Kandagatla, Ashok Raj Nagarajan, Ben Greear, Brian Norris, Colin Ian King, ath10k-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public•gmane.org, linux-wireless-u79uwXL29TY76Z2rM5mHXA@public•gmane.org, netdev-u79uwXL29TY76Z2rM5mHXA@public•gmane.org, linux-kernel-u79uwXL29TY76Z2rM5mHXA@public•gmane.org Arnd Bergmann <arnd-r2nGTMty4D4@public•gmane.org> writes: > 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 <arnd-r2nGTMty4D4@public•gmane.org> Brian has already fixed this, please check that: https://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git/commit/?h=ath-next&id=20665a9076d48e9abd9a2db13d307f58f7ef6647 But apparently I forgot to merge ath-next to wireless-drivers-next, will do that soon. -- Kalle Valo ^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] ath10k: move pci suspend/resume functions 2017-11-02 15:23 ` Kalle Valo @ 2017-11-02 15:40 ` Arnd Bergmann 2017-11-02 17:10 ` Brian Norris 0 siblings, 1 reply; 4+ messages in thread From: Arnd Bergmann @ 2017-11-02 15:40 UTC (permalink / raw) To: Kalle Valo Cc: 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 On Thu, Nov 2, 2017 at 4:23 PM, Kalle Valo <kvalo@qca•qualcomm.com> wrote: > Arnd Bergmann <arnd@arndb•de> writes: > >> 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 <arnd@arndb•de> > > Brian has already fixed this, please check that: > > https://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git/commit/?h=ath-next&id=20665a9076d48e9abd9a2db13d307f58f7ef6647 > > But apparently I forgot to merge ath-next to wireless-drivers-next, will > do that soon. Yes, Brian's version is better. I considered the same, but wasn't sure it was safe. Arnd ^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] ath10k: move pci suspend/resume functions 2017-11-02 15:40 ` Arnd Bergmann @ 2017-11-02 17:10 ` Brian Norris 0 siblings, 0 replies; 4+ messages in thread From: Brian Norris @ 2017-11-02 17:10 UTC (permalink / raw) To: Arnd Bergmann Cc: Kalle Valo, Ryan Hsu, Govind Singh, Srinivas Kandagatla, Ashok Raj Nagarajan, Ben Greear, Colin Ian King, ath10k@lists•infradead.org, linux-wireless@vger•kernel.org, netdev@vger•kernel.org, linux-kernel@vger•kernel.org On Thu, Nov 02, 2017 at 04:40:57PM +0100, Arnd Bergmann wrote: > On Thu, Nov 2, 2017 at 4:23 PM, Kalle Valo <kvalo@qca•qualcomm.com> wrote: > > Brian has already fixed this, please check that: > > > > https://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git/commit/?h=ath-next&id=20665a9076d48e9abd9a2db13d307f58f7ef6647 > > > > But apparently I forgot to merge ath-next to wireless-drivers-next, will > > do that soon. > > Yes, Brian's version is better. I considered the same, but wasn't sure > it was safe. Yes, it's safe. The code is still basically dead, since the mac80211 ops get dropped with !CONFIG_PM (so no one calls the *_hif_{suspend,resume}() functions), but at least we have fewer #ifdef's. Brian ^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2017-11-02 17:10 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-11-02 11:08 [PATCH] ath10k: move pci suspend/resume functions Arnd Bergmann
[not found] ` <20171102110903.2886660-1-arnd-r2nGTMty4D4@public.gmane.org>
2017-11-02 15:23 ` Kalle Valo
2017-11-02 15:40 ` Arnd Bergmann
2017-11-02 17:10 ` Brian Norris
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox