Merge ath-next from git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git

ath.git patches for 5.5. Major changes:

ath10k

* add support for hardware rfkill on devices where firmware supports it

diff --combined drivers/net/wireless/ath/ath5k/pci.c
index d5ee32ce9eb3dac632e3ebc5bdb9118425ab729c,e1378e203611ec5e6a44588f19bcc50f98ceaf20..43b4ae86e5fb236654b7632cfc0b5a8d8a707dac
--- 1/drivers/net/wireless/ath/ath5k/pci.c
--- 2/drivers/net/wireless/ath/ath5k/pci.c
+++ b/drivers/net/wireless/ath/ath5k/pci.c
@@@ -18,6 -18,7 +18,6 @@@
  
  #include <linux/nl80211.h>
  #include <linux/pci.h>
 -#include <linux/pci-aspm.h>
  #include <linux/etherdevice.h>
  #include <linux/module.h>
  #include "../ath.h"
@@@ -300,8 -301,7 +300,7 @@@ ath5k_pci_remove(struct pci_dev *pdev
  #ifdef CONFIG_PM_SLEEP
  static int ath5k_pci_suspend(struct device *dev)
  {
-       struct pci_dev *pdev = to_pci_dev(dev);
-       struct ieee80211_hw *hw = pci_get_drvdata(pdev);
+       struct ieee80211_hw *hw = dev_get_drvdata(dev);
        struct ath5k_hw *ah = hw->priv;
  
        ath5k_led_off(ah);