Merge branch 'next' into for-linus

1 files changed, 18 insertions, 45 deletions

diff --git a/drivers/net/wireless/rtlwifi/pci.c b/drivers/net/wireless/rtlwifi/pci.c
index 56f12358389d..eb61061821e4 100644
--- a/drivers/net/wireless/rtlwifi/pci.c
+++ b/drivers/net/wireless/rtlwifi/pci.c
@@ -27,6 +27,7 @@
  *
  *****************************************************************************/
 
+#include <linux/export.h>
 #include "core.h"
 #include "wifi.h"
 #include "pci.h"
@@ -218,7 +219,6 @@ static void rtl_pci_disable_aspm(struct ieee80211_hw *hw)
         struct rtl_ps_ctl *ppsc = rtl_psc(rtl_priv(hw));
         struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
         u8 pcibridge_vendor = pcipriv->ndis_adapter.pcibridge_vendor;
-        u32 pcicfg_addrport = pcipriv->ndis_adapter.pcicfg_addrport;
         u8 num4bytes = pcipriv->ndis_adapter.num4bytes;
         /*Retrieve original configuration settings. */
         u8 linkctrl_reg = pcipriv->ndis_adapter.linkctrl_reg;
@@ -254,9 +254,8 @@ static void rtl_pci_disable_aspm(struct ieee80211_hw *hw)
         udelay(50);
 
         /*4 Disable Pci Bridge ASPM */
-        rtl_pci_raw_write_port_ulong(PCI_CONF_ADDRESS,
-                                     pcicfg_addrport + (num4bytes << 2));
-        rtl_pci_raw_write_port_uchar(PCI_CONF_DATA, pcibridge_linkctrlreg);
+        pci_write_config_byte(rtlpci->pdev, (num4bytes << 2),
+                              pcibridge_linkctrlreg);
 
         udelay(50);
 }
@@ -277,7 +276,6 @@ static void rtl_pci_enable_aspm(struct ieee80211_hw *hw)
         u8 pcibridge_devnum = pcipriv->ndis_adapter.pcibridge_devnum;
         u8 pcibridge_funcnum = pcipriv->ndis_adapter.pcibridge_funcnum;
         u8 pcibridge_vendor = pcipriv->ndis_adapter.pcibridge_vendor;
-        u32 pcicfg_addrport = pcipriv->ndis_adapter.pcicfg_addrport;
         u8 num4bytes = pcipriv->ndis_adapter.num4bytes;
         u16 aspmlevel;
         u8 u_pcibridge_aspmsetting;
@@ -293,8 +291,6 @@ static void rtl_pci_enable_aspm(struct ieee80211_hw *hw)
         }
 
         /*4 Enable Pci Bridge ASPM */
-        rtl_pci_raw_write_port_ulong(PCI_CONF_ADDRESS,
-                                     pcicfg_addrport + (num4bytes << 2));
 
         u_pcibridge_aspmsetting =
             pcipriv->ndis_adapter.pcibridge_linkctrlreg |
@@ -303,7 +299,8 @@ static void rtl_pci_enable_aspm(struct ieee80211_hw *hw)
         if (pcibridge_vendor == PCI_BRIDGE_VENDOR_INTEL)
                 u_pcibridge_aspmsetting &= ~BIT(0);
 
-        rtl_pci_raw_write_port_uchar(PCI_CONF_DATA, u_pcibridge_aspmsetting);
+        pci_write_config_byte(rtlpci->pdev, (num4bytes << 2),
+                              u_pcibridge_aspmsetting);
 
         RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
                  ("PlatformEnableASPM():PciBridge busnumber[%x], "
@@ -335,25 +332,18 @@ static void rtl_pci_enable_aspm(struct ieee80211_hw *hw)
 
 static bool rtl_pci_get_amd_l1_patch(struct ieee80211_hw *hw)
 {
-        struct rtl_pci_priv *pcipriv = rtl_pcipriv(hw);
-        u32 pcicfg_addrport = pcipriv->ndis_adapter.pcicfg_addrport;
+        struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
 
         bool status = false;
         u8 offset_e0;
         unsigned offset_e4;
 
-        rtl_pci_raw_write_port_ulong(PCI_CONF_ADDRESS,
-                        pcicfg_addrport + 0xE0);
-        rtl_pci_raw_write_port_uchar(PCI_CONF_DATA, 0xA0);
+        pci_write_config_byte(rtlpci->pdev, 0xe0, 0xa0);
 
-        rtl_pci_raw_write_port_ulong(PCI_CONF_ADDRESS,
-                        pcicfg_addrport + 0xE0);
-        rtl_pci_raw_read_port_uchar(PCI_CONF_DATA, &offset_e0);
+        pci_read_config_byte(rtlpci->pdev, 0xe0, &offset_e0);
 
         if (offset_e0 == 0xA0) {
-                rtl_pci_raw_write_port_ulong(PCI_CONF_ADDRESS,
-                                             pcicfg_addrport + 0xE4);
-                rtl_pci_raw_read_port_ulong(PCI_CONF_DATA, &offset_e4);
+                pci_read_config_dword(rtlpci->pdev, 0xe4, &offset_e4);
                 if (offset_e4 & BIT(23))
                         status = true;
         }
@@ -364,17 +354,15 @@ static bool rtl_pci_get_amd_l1_patch(struct ieee80211_hw *hw)
 static void rtl_pci_get_linkcontrol_field(struct ieee80211_hw *hw)
 {
         struct rtl_pci_priv *pcipriv = rtl_pcipriv(hw);
+        struct rtl_pci *rtlpci = rtl_pcidev(pcipriv);
         u8 capabilityoffset = pcipriv->ndis_adapter.pcibridge_pciehdr_offset;
-        u32 pcicfg_addrport = pcipriv->ndis_adapter.pcicfg_addrport;
         u8 linkctrl_reg;
         u8 num4bbytes;
 
         num4bbytes = (capabilityoffset + 0x10) / 4;
 
         /*Read  Link Control Register */
-        rtl_pci_raw_write_port_ulong(PCI_CONF_ADDRESS,
-                                     pcicfg_addrport + (num4bbytes << 2));
-        rtl_pci_raw_read_port_uchar(PCI_CONF_DATA, &linkctrl_reg);
+        pci_read_config_byte(rtlpci->pdev, (num4bbytes << 2), &linkctrl_reg);
 
         pcipriv->ndis_adapter.pcibridge_linkctrlreg = linkctrl_reg;
 }
@@ -488,7 +476,7 @@ static void _rtl_pci_tx_chk_waitq(struct ieee80211_hw *hw)
         struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
         struct sk_buff *skb = NULL;
         struct ieee80211_tx_info *info = NULL;
-        int tid; /* should be int */
+        int tid;
 
         if (!rtlpriv->rtlhal.earlymode_enable)
                 return;
@@ -1538,7 +1526,7 @@ static int rtl_pci_start(struct ieee80211_hw *hw)
 
         rtl_init_rx_config(hw);
 
-        /*should after adapter start and interrupt enable. */
+        /*should be after adapter start and interrupt enable. */
         set_hal_start(rtlhal);
 
         RT_CLEAR_PS_LEVEL(ppsc, RT_RF_OFF_LEVL_HALT_NIC);
@@ -1559,7 +1547,7 @@ static void rtl_pci_stop(struct ieee80211_hw *hw)
         u8 RFInProgressTimeOut = 0;
 
         /*
-         *should before disable interrrupt&adapter
+         *should be before disable interrupt&adapter
          *and will do it immediately.
          */
         set_hal_stop(rtlhal);
@@ -1718,10 +1706,6 @@ static bool _rtl_pci_find_adapter(struct pci_dev *pdev,
                     PCI_SLOT(bridge_pdev->devfn);
                 pcipriv->ndis_adapter.pcibridge_funcnum =
                     PCI_FUNC(bridge_pdev->devfn);
-                pcipriv->ndis_adapter.pcicfg_addrport =
-                    (pcipriv->ndis_adapter.pcibridge_busnum << 16) |
-                    (pcipriv->ndis_adapter.pcibridge_devnum << 11) |
-                    (pcipriv->ndis_adapter.pcibridge_funcnum << 8) | (1 << 31);
                 pcipriv->ndis_adapter.pcibridge_pciehdr_offset =
                     pci_pcie_cap(bridge_pdev);
                 pcipriv->ndis_adapter.num4bytes =
@@ -2010,36 +1994,25 @@ call rtl_mac_stop() from the mac80211
 suspend function first, So there is
 no need to call hw_disable here.
 ****************************************/
-int rtl_pci_suspend(struct pci_dev *pdev, pm_message_t state)
+int rtl_pci_suspend(struct device *dev)
 {
+        struct pci_dev *pdev = to_pci_dev(dev);
         struct ieee80211_hw *hw = pci_get_drvdata(pdev);
         struct rtl_priv *rtlpriv = rtl_priv(hw);
 
         rtlpriv->cfg->ops->hw_suspend(hw);
         rtl_deinit_rfkill(hw);
 
-        pci_save_state(pdev);
-        pci_disable_device(pdev);
-        pci_set_power_state(pdev, PCI_D3hot);
         return 0;
 }
 EXPORT_SYMBOL(rtl_pci_suspend);
 
-int rtl_pci_resume(struct pci_dev *pdev)
+int rtl_pci_resume(struct device *dev)
 {
-        int ret;
+        struct pci_dev *pdev = to_pci_dev(dev);
         struct ieee80211_hw *hw = pci_get_drvdata(pdev);
         struct rtl_priv *rtlpriv = rtl_priv(hw);
 
-        pci_set_power_state(pdev, PCI_D0);
-        ret = pci_enable_device(pdev);
-        if (ret) {
-                RT_ASSERT(false, ("ERR: <======\n"));
-                return ret;
-        }
-
-        pci_restore_state(pdev);
-
         rtlpriv->cfg->ops->hw_resume(hw);
         rtl_init_rfkill(hw);
         return 0;