Commit 3e747fa1 authored by Kalle Valo's avatar Kalle Valo

Merge ath-current from ath.git

ath.git fixes for 4.14. Major changes:

ath10k

* fix a PCI PM related gcc warning
parents a715b3a0 6af1de2e
...@@ -3396,9 +3396,7 @@ static void ath10k_pci_remove(struct pci_dev *pdev) ...@@ -3396,9 +3396,7 @@ static void ath10k_pci_remove(struct pci_dev *pdev)
MODULE_DEVICE_TABLE(pci, ath10k_pci_id_table); MODULE_DEVICE_TABLE(pci, ath10k_pci_id_table);
#ifdef CONFIG_PM static __maybe_unused int ath10k_pci_pm_suspend(struct device *dev)
static int ath10k_pci_pm_suspend(struct device *dev)
{ {
struct ath10k *ar = dev_get_drvdata(dev); struct ath10k *ar = dev_get_drvdata(dev);
int ret; int ret;
...@@ -3414,7 +3412,7 @@ static int ath10k_pci_pm_suspend(struct device *dev) ...@@ -3414,7 +3412,7 @@ static int ath10k_pci_pm_suspend(struct device *dev)
return ret; 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); struct ath10k *ar = dev_get_drvdata(dev);
int ret; int ret;
...@@ -3433,7 +3431,6 @@ static int ath10k_pci_pm_resume(struct device *dev) ...@@ -3433,7 +3431,6 @@ static int ath10k_pci_pm_resume(struct device *dev)
static SIMPLE_DEV_PM_OPS(ath10k_pci_pm_ops, static SIMPLE_DEV_PM_OPS(ath10k_pci_pm_ops,
ath10k_pci_pm_suspend, ath10k_pci_pm_suspend,
ath10k_pci_pm_resume); ath10k_pci_pm_resume);
#endif
static struct pci_driver ath10k_pci_driver = { static struct pci_driver ath10k_pci_driver = {
.name = "ath10k_pci", .name = "ath10k_pci",
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment