| Message ID | 20171102110903.2886660-1-arnd@arndb.de (mailing list archive) |
|---|---|
| State | Rejected |
| Delegated to: | Kalle Valo |
| Headers | show |
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.
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
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
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) {
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(-)