diff options
| author | Kalle Valo <kvalo@codeaurora.org> | 2017-09-25 10:06:12 +0300 |
|---|---|---|
| committer | Kalle Valo <kvalo@codeaurora.org> | 2017-09-25 10:06:12 +0300 |
| commit | 3e747fa18202896b5be66b88478352d5880fb8eb (patch) | |
| tree | 8b9013d1254d830f88c0afaa0f900ab2a9ed7334 /drivers | |
| parent | a715b3a0efe76d36c3ef96a93894a13db9d3a72f (diff) | |
| parent | 6af1de2e4ec49635905aaed31d073a0d92c8d3bf (diff) | |
| download | linux-3e747fa18202896b5be66b88478352d5880fb8eb.tar.bz2 | |
Merge ath-current from ath.git
ath.git fixes for 4.14. Major changes:
ath10k
* fix a PCI PM related gcc warning
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/wireless/ath/ath10k/pci.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/net/wireless/ath/ath10k/pci.c b/drivers/net/wireless/ath/ath10k/pci.c index bc1633945a56..195dafb98131 100644 --- a/drivers/net/wireless/ath/ath10k/pci.c +++ b/drivers/net/wireless/ath/ath10k/pci.c @@ -3396,9 +3396,7 @@ static void ath10k_pci_remove(struct pci_dev *pdev) MODULE_DEVICE_TABLE(pci, ath10k_pci_id_table); -#ifdef CONFIG_PM - -static int ath10k_pci_pm_suspend(struct device *dev) +static __maybe_unused int ath10k_pci_pm_suspend(struct device *dev) { struct ath10k *ar = dev_get_drvdata(dev); int ret; @@ -3414,7 +3412,7 @@ static int ath10k_pci_pm_suspend(struct device *dev) return ret; } -static int ath10k_pci_pm_resume(struct device *dev) +static __maybe_unused int ath10k_pci_pm_resume(struct device *dev) { struct ath10k *ar = dev_get_drvdata(dev); int ret; @@ -3433,7 +3431,6 @@ static int ath10k_pci_pm_resume(struct device *dev) static SIMPLE_DEV_PM_OPS(ath10k_pci_pm_ops, ath10k_pci_pm_suspend, ath10k_pci_pm_resume); -#endif static struct pci_driver ath10k_pci_driver = { .name = "ath10k_pci", |