| Message ID | 20171019184517.GA76422@google.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 20665a9076d48e9abd9a2db13d307f58f7ef6647 |
| Delegated to: | Kalle Valo |
| Headers | show |
Brian Norris <briannorris@chromium.org> writes: > Build errors have been reported with CONFIG_PM=n: > > drivers/net/wireless/ath/ath10k/pci.c:3416:8: error: implicit > declaration of function 'ath10k_pci_suspend' > [-Werror=implicit-function-declaration] > > drivers/net/wireless/ath/ath10k/pci.c:3428:8: error: implicit > declaration of function 'ath10k_pci_resume' > [-Werror=implicit-function-declaration] > > These are caused by the combination of the following two commits: > > 6af1de2e4ec4 ("ath10k: mark PM functions as __maybe_unused") > 96378bd2c6cd ("ath10k: fix core PCI suspend when WoWLAN is supported but > disabled") > > Both build fine on their own. > > But now that ath10k_pci_pm_{suspend,resume}() is compiled > unconditionally, we should also compile ath10k_pci_{suspend,resume}() > unconditionally. > > And drop the #ifdef around ath10k_pci_hif_{suspend,resume}() too; they > are trivial (empty), so we're not saving much space by compiling them > out. And the alternatives would be to sprinkle more __maybe_unused, or > spread the #ifdef's further. > > Build tested with the following combinations: > CONFIG_PM=y && CONFIG_PM_SLEEP=y > CONFIG_PM=y && CONFIG_PM_SLEEP=n > CONFIG_PM=n > > Fixes: 96378bd2c6cd ("ath10k: fix core PCI suspend when WoWLAN is > supported but disabled") > Fixes: 096ad2a15fd8 ("Merge branch 'ath-next'") > Signed-off-by: Brian Norris <briannorris@chromium.org> > --- > drivers/net/wireless/ath/ath10k/pci.c | 5 ----- > 1 file changed, 5 deletions(-) > > On Thu, Oct 19, 2017 at 10:12:25AM -0700, Brian Norris wrote: >> The solution would seem to be either to kill the #ifdefs around >> ath10k_pci_{suspend,resume}() and friends (and use __maybe_unused >> instead, to further extend Arnd's patch), or else revert Arnd's stuff >> and go with CONFIG_PM_SLEEP everywhere, which would resolve the original >> warning (promoted to error) that Arnd was resolving. >> >> I can send out one of these if you'd like. > > Here you go :) Thanks! As this an unusual merge problem between two branches I applied this manually to ath.git master-pending branch for now. Let's see if kbuild bot is happy now.
Brian Norris <briannorris@chromium.org> wrote: > Build errors have been reported with CONFIG_PM=n: > > drivers/net/wireless/ath/ath10k/pci.c:3416:8: error: implicit > declaration of function 'ath10k_pci_suspend' > [-Werror=implicit-function-declaration] > > drivers/net/wireless/ath/ath10k/pci.c:3428:8: error: implicit > declaration of function 'ath10k_pci_resume' > [-Werror=implicit-function-declaration] > > These are caused by the combination of the following two commits: > > 6af1de2e4ec4 ("ath10k: mark PM functions as __maybe_unused") > 96378bd2c6cd ("ath10k: fix core PCI suspend when WoWLAN is supported but > disabled") > > Both build fine on their own. > > But now that ath10k_pci_pm_{suspend,resume}() is compiled > unconditionally, we should also compile ath10k_pci_{suspend,resume}() > unconditionally. > > And drop the #ifdef around ath10k_pci_hif_{suspend,resume}() too; they > are trivial (empty), so we're not saving much space by compiling them > out. And the alternatives would be to sprinkle more __maybe_unused, or > spread the #ifdef's further. > > Build tested with the following combinations: > CONFIG_PM=y && CONFIG_PM_SLEEP=y > CONFIG_PM=y && CONFIG_PM_SLEEP=n > CONFIG_PM=n > > Fixes: 96378bd2c6cd ("ath10k: fix core PCI suspend when WoWLAN is supported but disabled") > Fixes: 096ad2a15fd8 ("Merge branch 'ath-next'") > Signed-off-by: Brian Norris <briannorris@chromium.org> > Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com> Patch applied to ath-next branch of ath.git, thanks. 20665a9076d4 ath10k: fix build errors with !CONFIG_PM
diff --git a/drivers/net/wireless/ath/ath10k/pci.c b/drivers/net/wireless/ath/ath10k/pci.c index b18a9b690df4..d790ea20b95d 100644 --- a/drivers/net/wireless/ath/ath10k/pci.c +++ b/drivers/net/wireless/ath/ath10k/pci.c @@ -2577,8 +2577,6 @@ void ath10k_pci_hif_power_down(struct ath10k *ar) */ } -#ifdef CONFIG_PM - static int ath10k_pci_hif_suspend(struct ath10k *ar) { /* Nothing to do; the important stuff is in the driver suspend. */ @@ -2627,7 +2625,6 @@ static int ath10k_pci_resume(struct ath10k *ar) return ret; } -#endif static bool ath10k_pci_validate_cal(void *data, size_t size) { @@ -2782,10 +2779,8 @@ static const struct ath10k_hif_ops ath10k_pci_hif_ops = { .power_down = ath10k_pci_hif_power_down, .read32 = ath10k_pci_read32, .write32 = ath10k_pci_write32, -#ifdef CONFIG_PM .suspend = ath10k_pci_hif_suspend, .resume = ath10k_pci_hif_resume, -#endif .fetch_cal_eeprom = ath10k_pci_hif_fetch_cal_eeprom, };
Build errors have been reported with CONFIG_PM=n: drivers/net/wireless/ath/ath10k/pci.c:3416:8: error: implicit declaration of function 'ath10k_pci_suspend' [-Werror=implicit-function-declaration] drivers/net/wireless/ath/ath10k/pci.c:3428:8: error: implicit declaration of function 'ath10k_pci_resume' [-Werror=implicit-function-declaration] These are caused by the combination of the following two commits: 6af1de2e4ec4 ("ath10k: mark PM functions as __maybe_unused") 96378bd2c6cd ("ath10k: fix core PCI suspend when WoWLAN is supported but disabled") Both build fine on their own. But now that ath10k_pci_pm_{suspend,resume}() is compiled unconditionally, we should also compile ath10k_pci_{suspend,resume}() unconditionally. And drop the #ifdef around ath10k_pci_hif_{suspend,resume}() too; they are trivial (empty), so we're not saving much space by compiling them out. And the alternatives would be to sprinkle more __maybe_unused, or spread the #ifdef's further. Build tested with the following combinations: CONFIG_PM=y && CONFIG_PM_SLEEP=y CONFIG_PM=y && CONFIG_PM_SLEEP=n CONFIG_PM=n Fixes: 96378bd2c6cd ("ath10k: fix core PCI suspend when WoWLAN is supported but disabled") Fixes: 096ad2a15fd8 ("Merge branch 'ath-next'") Signed-off-by: Brian Norris <briannorris@chromium.org> --- drivers/net/wireless/ath/ath10k/pci.c | 5 ----- 1 file changed, 5 deletions(-) On Thu, Oct 19, 2017 at 10:12:25AM -0700, Brian Norris wrote: > The solution would seem to be either to kill the #ifdefs around > ath10k_pci_{suspend,resume}() and friends (and use __maybe_unused > instead, to further extend Arnd's patch), or else revert Arnd's stuff > and go with CONFIG_PM_SLEEP everywhere, which would resolve the original > warning (promoted to error) that Arnd was resolving. > > I can send out one of these if you'd like. Here you go :)