| 123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172 |
- From: Brian Norris <[email protected]>
- Date: Thu, 19 Oct 2017 11:45:19 -0700
- Subject: [PATCH] ath10k: fix build errors with !CONFIG_PM
- 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 <[email protected]>
- Signed-off-by: Kalle Valo <[email protected]>
- ---
- --- 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 at
- */
- }
-
- -#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 ath1
-
- return ret;
- }
- -#endif
-
- static bool ath10k_pci_validate_cal(void *data, size_t size)
- {
- @@ -2782,10 +2779,8 @@ static const struct ath10k_hif_ops ath10
- .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,
- };
-
|
