staging: rtl8192e: Remove ActUpdateChannelAccessSetting
[firefly-linux-kernel-4.4.55.git] / drivers / staging / rtl8192e / rtl8192e / r8192E_dev.c
index 2f64a0fa512c6955f92e750675192fd1f6dfd4f7..f8ad81e8fb1fb64c68fe372bd203743d744ec632 100644 (file)
@@ -43,17 +43,17 @@ void rtl92e_start_beacon(struct net_device *dev)
 
        rtl92e_irq_disable(dev);
 
-       write_nic_word(dev, ATIMWND, 2);
+       rtl92e_writew(dev, ATIMWND, 2);
 
-       write_nic_word(dev, BCN_INTERVAL, net->beacon_interval);
-       write_nic_word(dev, BCN_DRV_EARLY_INT, 10);
-       write_nic_word(dev, BCN_DMATIME, 256);
+       rtl92e_writew(dev, BCN_INTERVAL, net->beacon_interval);
+       rtl92e_writew(dev, BCN_DRV_EARLY_INT, 10);
+       rtl92e_writew(dev, BCN_DMATIME, 256);
 
-       write_nic_byte(dev, BCN_ERR_THRESH, 100);
+       rtl92e_writeb(dev, BCN_ERR_THRESH, 100);
 
        BcnTimeCfg |= BcnCW<<BCN_TCFG_CW_SHIFT;
        BcnTimeCfg |= BcnIFS<<BCN_TCFG_IFS;
-       write_nic_word(dev, BCN_TCFG, BcnTimeCfg);
+       rtl92e_writew(dev, BCN_TCFG, BcnTimeCfg);
        rtl92e_irq_enable(dev);
 }
 
@@ -90,7 +90,7 @@ static void rtl8192e_update_msr(struct net_device *dev)
                break;
        }
 
-       write_nic_byte(dev, MSR, msr);
+       rtl92e_writeb(dev, MSR, msr);
        if (priv->rtllib->LedControlHandler)
                priv->rtllib->LedControlHandler(dev, LedAction);
 }
@@ -101,8 +101,8 @@ void rtl92e_set_reg(struct net_device *dev, u8 variable, u8 *val)
 
        switch (variable) {
        case HW_VAR_BSSID:
-               write_nic_dword(dev, BSSIDR, ((u32 *)(val))[0]);
-               write_nic_word(dev, BSSIDR+2, ((u16 *)(val+2))[0]);
+               rtl92e_writel(dev, BSSIDR, ((u32 *)(val))[0]);
+               rtl92e_writew(dev, BSSIDR+2, ((u16 *)(val+2))[0]);
                break;
 
        case HW_VAR_MEDIA_STATUS:
@@ -133,7 +133,7 @@ void rtl92e_set_reg(struct net_device *dev, u8 variable, u8 *val)
                        break;
                }
 
-               write_nic_byte(dev, MSR, btMsr);
+               rtl92e_writeb(dev, MSR, btMsr);
 
        }
        break;
@@ -151,7 +151,7 @@ void rtl92e_set_reg(struct net_device *dev, u8 variable, u8 *val)
                else if (Type == false)
                        RegRCR &= (~RCR_CBSSID);
 
-               write_nic_dword(dev, RCR, RegRCR);
+               rtl92e_writel(dev, RCR, RegRCR);
                priv->ReceiveConfig = RegRCR;
 
        }
@@ -160,7 +160,7 @@ void rtl92e_set_reg(struct net_device *dev, u8 variable, u8 *val)
        case HW_VAR_SLOT_TIME:
 
                priv->slot_time = val[0];
-               write_nic_byte(dev, SLOT_TIME, val[0]);
+               rtl92e_writeb(dev, SLOT_TIME, val[0]);
 
                break;
 
@@ -172,12 +172,12 @@ void rtl92e_set_reg(struct net_device *dev, u8 variable, u8 *val)
                regTmp = priv->basic_rate;
                if (priv->short_preamble)
                        regTmp |= BRSR_AckShortPmb;
-               write_nic_dword(dev, RRSR, regTmp);
+               rtl92e_writel(dev, RRSR, regTmp);
                break;
        }
 
        case HW_VAR_CPU_RST:
-               write_nic_dword(dev, CPU_GEN, ((u32 *)(val))[0]);
+               rtl92e_writel(dev, CPU_GEN, ((u32 *)(val))[0]);
                break;
 
        case HW_VAR_AC_PARAM:
@@ -193,7 +193,7 @@ void rtl92e_set_reg(struct net_device *dev, u8 variable, u8 *val)
                u1bAIFS = qop->aifs[pAcParam] *
                          ((mode&(IEEE_G|IEEE_N_24G)) ? 9 : 20) + aSifsTime;
 
-               dm_init_edca_turbo(dev);
+               rtl92e_dm_init_edca_turbo(dev);
 
                u4bAcParam = (le16_to_cpu(qop->tx_op_limit[pAcParam]) <<
                              AC_PARAM_TXOP_LIMIT_OFFSET) |
@@ -207,19 +207,19 @@ void rtl92e_set_reg(struct net_device *dev, u8 variable, u8 *val)
                         __func__, eACI, u4bAcParam);
                switch (eACI) {
                case AC1_BK:
-                       write_nic_dword(dev, EDCAPARA_BK, u4bAcParam);
+                       rtl92e_writel(dev, EDCAPARA_BK, u4bAcParam);
                        break;
 
                case AC0_BE:
-                       write_nic_dword(dev, EDCAPARA_BE, u4bAcParam);
+                       rtl92e_writel(dev, EDCAPARA_BE, u4bAcParam);
                        break;
 
                case AC2_VI:
-                       write_nic_dword(dev, EDCAPARA_VI, u4bAcParam);
+                       rtl92e_writel(dev, EDCAPARA_VI, u4bAcParam);
                        break;
 
                case AC3_VO:
-                       write_nic_dword(dev, EDCAPARA_VO, u4bAcParam);
+                       rtl92e_writel(dev, EDCAPARA_VO, u4bAcParam);
                        break;
 
                default:
@@ -289,20 +289,20 @@ void rtl92e_set_reg(struct net_device *dev, u8 variable, u8 *val)
                RT_TRACE(COMP_QOS,
                         "SetHwReg8190pci(): [HW_VAR_ACM_CTRL] Write 0x%X\n",
                         AcmCtrl);
-               write_nic_byte(dev, AcmHwCtrl, AcmCtrl);
+               rtl92e_writeb(dev, AcmHwCtrl, AcmCtrl);
                break;
        }
 
        case HW_VAR_SIFS:
-               write_nic_byte(dev, SIFS, val[0]);
-               write_nic_byte(dev, SIFS+1, val[0]);
+               rtl92e_writeb(dev, SIFS, val[0]);
+               rtl92e_writeb(dev, SIFS+1, val[0]);
                break;
 
        case HW_VAR_RF_TIMING:
        {
                u8 Rf_Timing = *((u8 *)val);
 
-               write_nic_byte(dev, rFPGA0_RFTiming1, Rf_Timing);
+               rtl92e_writeb(dev, rFPGA0_RFTiming1, Rf_Timing);
                break;
        }
 
@@ -323,7 +323,7 @@ static void rtl8192_read_eeprom_info(struct net_device *dev)
 
        RT_TRACE(COMP_INIT, "====> rtl8192_read_eeprom_info\n");
 
-       EEPROMId = eprom_read(dev, 0);
+       EEPROMId = rtl92e_eeprom_read(dev, 0);
        if (EEPROMId != RTL8190_EEPROM_ID) {
                netdev_err(dev, "%s(): Invalid EEPROM ID: %x\n", __func__,
                           EEPROMId);
@@ -333,12 +333,14 @@ static void rtl8192_read_eeprom_info(struct net_device *dev)
        }
 
        if (!priv->AutoloadFailFlag) {
-               priv->eeprom_vid = eprom_read(dev, EEPROM_VID >> 1);
-               priv->eeprom_did = eprom_read(dev, EEPROM_DID >> 1);
+               priv->eeprom_vid = rtl92e_eeprom_read(dev, EEPROM_VID >> 1);
+               priv->eeprom_did = rtl92e_eeprom_read(dev, EEPROM_DID >> 1);
 
-               usValue = eprom_read(dev, (u16)(EEPROM_Customer_ID>>1)) >> 8;
+               usValue = rtl92e_eeprom_read(dev,
+                                            (u16)(EEPROM_Customer_ID>>1)) >> 8;
                priv->eeprom_CustomerID = (u8)(usValue & 0xff);
-               usValue = eprom_read(dev, EEPROM_ICVersion_ChannelPlan>>1);
+               usValue = rtl92e_eeprom_read(dev,
+                                            EEPROM_ICVersion_ChannelPlan>>1);
                priv->eeprom_ChannelPlan = usValue&0xff;
                IC_Version = (usValue & 0xff00)>>8;
 
@@ -376,7 +378,7 @@ static void rtl8192_read_eeprom_info(struct net_device *dev)
 
        if (!priv->AutoloadFailFlag) {
                for (i = 0; i < 6; i += 2) {
-                       usValue = eprom_read(dev,
+                       usValue = rtl92e_eeprom_read(dev,
                                 (u16)((EEPROM_NODE_ADDRESS_BYTE_0 + i) >> 1));
                        *(u16 *)(&dev->dev_addr[i]) = usValue;
                }
@@ -396,8 +398,8 @@ static void rtl8192_read_eeprom_info(struct net_device *dev)
 
        if (priv->card_8192_version > VERSION_8190_BD) {
                if (!priv->AutoloadFailFlag) {
-                       tempval = (eprom_read(dev, (EEPROM_RFInd_PowerDiff >>
-                                             1))) & 0xff;
+                       tempval = (rtl92e_eeprom_read(dev,
+                                                     (EEPROM_RFInd_PowerDiff >> 1))) & 0xff;
                        priv->EEPROMLegacyHTTxPowerDiff = tempval & 0xf;
 
                        if (tempval&0x80)
@@ -411,7 +413,7 @@ static void rtl8192_read_eeprom_info(struct net_device *dev)
                        priv->EEPROMLegacyHTTxPowerDiff);
 
                if (!priv->AutoloadFailFlag)
-                       priv->EEPROMThermalMeter = (u8)(((eprom_read(dev,
+                       priv->EEPROMThermalMeter = (u8)(((rtl92e_eeprom_read(dev,
                                                   (EEPROM_ThermalMeter>>1))) &
                                                   0xff00)>>8);
                else
@@ -422,7 +424,7 @@ static void rtl8192_read_eeprom_info(struct net_device *dev)
 
                if (priv->epromtype == EEPROM_93C46) {
                        if (!priv->AutoloadFailFlag) {
-                               usValue = eprom_read(dev,
+                               usValue = rtl92e_eeprom_read(dev,
                                          EEPROM_TxPwDiff_CrystalCap >> 1);
                                priv->EEPROMAntPwDiff = (usValue&0x0fff);
                                priv->EEPROMCrystalCap = (u8)((usValue & 0xf000)
@@ -440,7 +442,7 @@ static void rtl8192_read_eeprom_info(struct net_device *dev)
 
                        for (i = 0; i < 14; i += 2) {
                                if (!priv->AutoloadFailFlag)
-                                       usValue = eprom_read(dev,
+                                       usValue = rtl92e_eeprom_read(dev,
                                                  (u16)((EEPROM_TxPwIndex_CCK +
                                                  i) >> 1));
                                else
@@ -456,7 +458,7 @@ static void rtl8192_read_eeprom_info(struct net_device *dev)
                        }
                        for (i = 0; i < 14; i += 2) {
                                if (!priv->AutoloadFailFlag)
-                                       usValue = eprom_read(dev,
+                                       usValue = rtl92e_eeprom_read(dev,
                                                (u16)((EEPROM_TxPwIndex_OFDM_24G
                                                + i) >> 1));
                                else
@@ -560,7 +562,7 @@ static void rtl8192_read_eeprom_info(struct net_device *dev)
                RT_TRACE(COMP_INIT, "\n2T4R config\n");
        }
 
-       init_rate_adaptive(dev);
+       rtl92e_init_adaptive_rate(dev);
 
        priv->rf_chip = RF_8256;
 
@@ -683,23 +685,23 @@ static void rtl8192_hwconfig(struct net_device *dev)
                break;
        }
 
-       write_nic_byte(dev, BW_OPMODE, regBwOpMode);
+       rtl92e_writeb(dev, BW_OPMODE, regBwOpMode);
        {
                u32 ratr_value = 0;
 
                ratr_value = regRATR;
                if (priv->rf_type == RF_1T2R)
                        ratr_value &= ~(RATE_ALL_OFDM_2SS);
-               write_nic_dword(dev, RATR0, ratr_value);
-               write_nic_byte(dev, UFWP, 1);
+               rtl92e_writel(dev, RATR0, ratr_value);
+               rtl92e_writeb(dev, UFWP, 1);
        }
        regTmp = rtl92e_readb(dev, 0x313);
        regRRSR = ((regTmp) << 24) | (regRRSR & 0x00ffffff);
-       write_nic_dword(dev, RRSR, regRRSR);
+       rtl92e_writel(dev, RRSR, regRRSR);
 
-       write_nic_word(dev, RETRY_LIMIT,
-                       priv->ShortRetryLimit << RETRY_LIMIT_SHORT_SHIFT |
-                       priv->LongRetryLimit << RETRY_LIMIT_LONG_SHIFT);
+       rtl92e_writew(dev, RETRY_LIMIT,
+                     priv->ShortRetryLimit << RETRY_LIMIT_SHORT_SHIFT |
+                     priv->LongRetryLimit << RETRY_LIMIT_LONG_SHIFT);
 }
 
 bool rtl92e_start_adapter(struct net_device *dev)
@@ -721,7 +723,7 @@ start:
        rtl92e_reset_desc_ring(dev);
        priv->Rf_Mode = RF_OP_By_SW_3wire;
        if (priv->ResetProgress == RESET_TYPE_NORESET) {
-               write_nic_byte(dev, ANAPAR, 0x37);
+               rtl92e_writeb(dev, ANAPAR, 0x37);
                mdelay(500);
        }
        priv->pFirmware->firmware_status = FW_STATUS_0_INIT;
@@ -738,15 +740,15 @@ start:
                netdev_err(dev, "%s(): undefined firmware state: %d.\n",
                           __func__, priv->pFirmware->firmware_status);
 
-       write_nic_dword(dev, CPU_GEN, ulRegRead);
+       rtl92e_writel(dev, CPU_GEN, ulRegRead);
 
        ICVersion = rtl92e_readb(dev, IC_VERRSION);
        if (ICVersion >= 0x4) {
                SwitchingRegulatorOutput = rtl92e_readb(dev, SWREGULATOR);
                if (SwitchingRegulatorOutput  != 0xb8) {
-                       write_nic_byte(dev, SWREGULATOR, 0xa8);
+                       rtl92e_writeb(dev, SWREGULATOR, 0xa8);
                        mdelay(1);
-                       write_nic_byte(dev, SWREGULATOR, 0xb8);
+                       rtl92e_writeb(dev, SWREGULATOR, 0xb8);
                }
        }
        RT_TRACE(COMP_INIT, "BB Config Start!\n");
@@ -769,43 +771,43 @@ start:
                        netdev_err(dev, "%s: Invalid loopback mode setting.\n",
                                   __func__);
 
-               write_nic_dword(dev, CPU_GEN, ulRegRead);
+               rtl92e_writel(dev, CPU_GEN, ulRegRead);
 
                udelay(500);
        }
        rtl8192_hwconfig(dev);
-       write_nic_byte(dev, CMDR, CR_RE | CR_TE);
-
-       write_nic_byte(dev, PCIF, ((MXDMA2_NoLimit<<MXDMA2_RX_SHIFT) |
-                      (MXDMA2_NoLimit<<MXDMA2_TX_SHIFT)));
-       write_nic_dword(dev, MAC0, ((u32 *)dev->dev_addr)[0]);
-       write_nic_word(dev, MAC4, ((u16 *)(dev->dev_addr + 4))[0]);
-       write_nic_dword(dev, RCR, priv->ReceiveConfig);
-
-       write_nic_dword(dev, RQPN1,  NUM_OF_PAGE_IN_FW_QUEUE_BK <<
-                       RSVD_FW_QUEUE_PAGE_BK_SHIFT |
-                       NUM_OF_PAGE_IN_FW_QUEUE_BE <<
-                       RSVD_FW_QUEUE_PAGE_BE_SHIFT |
-                       NUM_OF_PAGE_IN_FW_QUEUE_VI <<
-                       RSVD_FW_QUEUE_PAGE_VI_SHIFT |
-                       NUM_OF_PAGE_IN_FW_QUEUE_VO <<
-                       RSVD_FW_QUEUE_PAGE_VO_SHIFT);
-       write_nic_dword(dev, RQPN2, NUM_OF_PAGE_IN_FW_QUEUE_MGNT <<
-                       RSVD_FW_QUEUE_PAGE_MGNT_SHIFT);
-       write_nic_dword(dev, RQPN3, APPLIED_RESERVED_QUEUE_IN_FW |
-                       NUM_OF_PAGE_IN_FW_QUEUE_BCN <<
-                       RSVD_FW_QUEUE_PAGE_BCN_SHIFT|
-                       NUM_OF_PAGE_IN_FW_QUEUE_PUB <<
-                       RSVD_FW_QUEUE_PAGE_PUB_SHIFT);
+       rtl92e_writeb(dev, CMDR, CR_RE | CR_TE);
+
+       rtl92e_writeb(dev, PCIF, ((MXDMA2_NoLimit<<MXDMA2_RX_SHIFT) |
+                                 (MXDMA2_NoLimit<<MXDMA2_TX_SHIFT)));
+       rtl92e_writel(dev, MAC0, ((u32 *)dev->dev_addr)[0]);
+       rtl92e_writew(dev, MAC4, ((u16 *)(dev->dev_addr + 4))[0]);
+       rtl92e_writel(dev, RCR, priv->ReceiveConfig);
+
+       rtl92e_writel(dev, RQPN1, NUM_OF_PAGE_IN_FW_QUEUE_BK <<
+                     RSVD_FW_QUEUE_PAGE_BK_SHIFT |
+                     NUM_OF_PAGE_IN_FW_QUEUE_BE <<
+                     RSVD_FW_QUEUE_PAGE_BE_SHIFT |
+                     NUM_OF_PAGE_IN_FW_QUEUE_VI <<
+                     RSVD_FW_QUEUE_PAGE_VI_SHIFT |
+                     NUM_OF_PAGE_IN_FW_QUEUE_VO <<
+                     RSVD_FW_QUEUE_PAGE_VO_SHIFT);
+       rtl92e_writel(dev, RQPN2, NUM_OF_PAGE_IN_FW_QUEUE_MGNT <<
+                     RSVD_FW_QUEUE_PAGE_MGNT_SHIFT);
+       rtl92e_writel(dev, RQPN3, APPLIED_RESERVED_QUEUE_IN_FW |
+                     NUM_OF_PAGE_IN_FW_QUEUE_BCN <<
+                     RSVD_FW_QUEUE_PAGE_BCN_SHIFT|
+                     NUM_OF_PAGE_IN_FW_QUEUE_PUB <<
+                     RSVD_FW_QUEUE_PAGE_PUB_SHIFT);
 
        rtl92e_tx_enable(dev);
        rtl92e_rx_enable(dev);
        ulRegRead = (0xFFF00000 & rtl92e_readl(dev, RRSR))  |
                     RATE_ALL_OFDM_AG | RATE_ALL_CCK;
-       write_nic_dword(dev, RRSR, ulRegRead);
-       write_nic_dword(dev, RATR0+4*7, (RATE_ALL_OFDM_AG | RATE_ALL_CCK));
+       rtl92e_writel(dev, RRSR, ulRegRead);
+       rtl92e_writel(dev, RATR0+4*7, (RATE_ALL_OFDM_AG | RATE_ALL_CCK));
 
-       write_nic_byte(dev, ACK_TIMEOUT, 0x30);
+       rtl92e_writeb(dev, ACK_TIMEOUT, 0x30);
 
        if (priv->ResetProgress == RESET_TYPE_NORESET)
                rtl92e_set_wireless_mode(dev, priv->rtllib->mode);
@@ -816,17 +818,17 @@ start:
                SECR_value |= SCR_TxEncEnable;
                SECR_value |= SCR_RxDecEnable;
                SECR_value |= SCR_NoSKMC;
-               write_nic_byte(dev, SECR, SECR_value);
+               rtl92e_writeb(dev, SECR, SECR_value);
        }
-       write_nic_word(dev, ATIMWND, 2);
-       write_nic_word(dev, BCN_INTERVAL, 100);
+       rtl92e_writew(dev, ATIMWND, 2);
+       rtl92e_writew(dev, BCN_INTERVAL, 100);
        {
                int i;
 
                for (i = 0; i < QOS_QUEUE_NUM; i++)
-                       write_nic_dword(dev, WDCAPARA_ADD[i], 0x005e4332);
+                       rtl92e_writel(dev, WDCAPARA_ADD[i], 0x005e4332);
        }
-       write_nic_byte(dev, 0xbe, 0xc0);
+       rtl92e_writeb(dev, 0xbe, 0xc0);
 
        rtl92e_config_mac(dev);
 
@@ -850,7 +852,7 @@ start:
        }
 
        RT_TRACE(COMP_INIT, "Load Firmware!\n");
-       bfirmwareok = init_firmware(dev);
+       bfirmwareok = rtl92e_init_fw(dev);
        if (!bfirmwareok) {
                if (retry_times < 10) {
                        retry_times++;
@@ -870,12 +872,11 @@ start:
                }
                RT_TRACE(COMP_INIT, "RF Config Finished!\n");
        }
-       rtl8192_phy_updateInitGain(dev);
 
        rtl92e_set_bb_reg(dev, rFPGA0_RFMOD, bCCKEn, 0x1);
        rtl92e_set_bb_reg(dev, rFPGA0_RFMOD, bOFDMEn, 0x1);
 
-       write_nic_byte(dev, 0x87, 0x0);
+       rtl92e_writeb(dev, 0x87, 0x0);
 
        if (priv->RegRfOff) {
                RT_TRACE((COMP_INIT | COMP_RF | COMP_POWER),
@@ -907,7 +908,7 @@ start:
                priv->Rf_Mode = RF_OP_By_SW_3wire;
 
        if (priv->ResetProgress == RESET_TYPE_NORESET) {
-               dm_initialize_txpower_tracking(dev);
+               rtl92e_dm_init_txpower_tracking(dev);
 
                if (priv->IC_Cut >= IC_VersionCut_D) {
                        tmpRegA = rtl92e_get_bb_reg(dev, rOFDM0_XATxIQImbalance,
@@ -971,20 +972,20 @@ static void rtl8192_net_update(struct net_device *dev)
        rtl92e_config_rate(dev, &rate_config);
        priv->dot11CurrentPreambleMode = PREAMBLE_AUTO;
         priv->basic_rate = rate_config &= 0x15f;
-       write_nic_dword(dev, BSSIDR, ((u32 *)net->bssid)[0]);
-       write_nic_word(dev, BSSIDR+4, ((u16 *)net->bssid)[2]);
+       rtl92e_writel(dev, BSSIDR, ((u32 *)net->bssid)[0]);
+       rtl92e_writew(dev, BSSIDR+4, ((u16 *)net->bssid)[2]);
 
        if (priv->rtllib->iw_mode == IW_MODE_ADHOC) {
-               write_nic_word(dev, ATIMWND, 2);
-               write_nic_word(dev, BCN_DMATIME, 256);
-               write_nic_word(dev, BCN_INTERVAL, net->beacon_interval);
-               write_nic_word(dev, BCN_DRV_EARLY_INT, 10);
-               write_nic_byte(dev, BCN_ERR_THRESH, 100);
+               rtl92e_writew(dev, ATIMWND, 2);
+               rtl92e_writew(dev, BCN_DMATIME, 256);
+               rtl92e_writew(dev, BCN_INTERVAL, net->beacon_interval);
+               rtl92e_writew(dev, BCN_DRV_EARLY_INT, 10);
+               rtl92e_writeb(dev, BCN_ERR_THRESH, 100);
 
                BcnTimeCfg |= (BcnCW<<BCN_TCFG_CW_SHIFT);
                BcnTimeCfg |= BcnIFS<<BCN_TCFG_IFS;
 
-               write_nic_word(dev, BCN_TCFG, BcnTimeCfg);
+               rtl92e_writew(dev, BCN_TCFG, BcnTimeCfg);
        }
 }
 
@@ -1003,7 +1004,7 @@ void rtl92e_link_change(struct net_device *dev)
                    (KEY_TYPE_WEP104 == ieee->pairwise_key_type))
                        rtl92e_enable_hw_security_config(dev);
        } else {
-               write_nic_byte(dev, 0x173, 0);
+               rtl92e_writeb(dev, 0x173, 0);
        }
        rtl8192e_update_msr(dev);
 
@@ -1019,7 +1020,7 @@ void rtl92e_link_change(struct net_device *dev)
                } else
                        priv->ReceiveConfig = reg &= ~RCR_CBSSID;
 
-               write_nic_dword(dev, RCR, reg);
+               rtl92e_writel(dev, RCR, reg);
        }
 }
 
@@ -1034,7 +1035,7 @@ void rtl92e_set_monitor_mode(struct net_device *dev, bool bAllowAllDA,
                priv->ReceiveConfig &= ~RCR_AAP;
 
        if (WriteIntoReg)
-               write_nic_dword(dev, RCR, priv->ReceiveConfig);
+               rtl92e_writel(dev, RCR, priv->ReceiveConfig);
 }
 
 static u8 MRateToHwRate8190Pci(u8 rate)
@@ -1821,7 +1822,7 @@ static void rtl8192_process_phyinfo(struct r8192_priv *priv, u8 *buffer,
                                        (RX_SMOOTH-1)) +
                                        (prev_st->RxPWDBAll)) / (RX_SMOOTH);
                }
-               rtl819x_update_rxsignalstatistics8190pci(priv, prev_st);
+               rtl92e_update_rx_statistics(priv, prev_st);
        }
 
        if (prev_st->SignalQuality != 0) {
@@ -2071,7 +2072,7 @@ bool rtl92e_get_rx_stats(struct net_device *dev, struct rtllib_rx_stats *stats,
        stats->TimeStampLow = pDrvInfo->TSFL;
        stats->TimeStampHigh = rtl92e_readl(dev, TSFR+4);
 
-       rtl819x_UpdateRxPktTimeStamp(dev, stats);
+       rtl92e_update_rx_pkt_timestamp(dev, stats);
 
        if ((stats->RxBufShift + stats->RxDrvInfoSize) > 0)
                stats->bShift = 1;
@@ -2108,7 +2109,7 @@ void rtl92e_stop_adapter(struct net_device *dev, bool reset)
 
        if (!priv->rtllib->bSupportRemoteWakeUp) {
                u1bTmp = 0x0;
-               write_nic_byte(dev, CMDR, u1bTmp);
+               rtl92e_writeb(dev, CMDR, u1bTmp);
        }
 
        mdelay(20);
@@ -2122,15 +2123,15 @@ void rtl92e_stop_adapter(struct net_device *dev, bool reset)
                        rtl92e_set_rf_off(dev);
                        ulRegRead = rtl92e_readl(dev, CPU_GEN);
                        ulRegRead |= CPU_GEN_SYSTEM_RESET;
-                       write_nic_dword(dev, CPU_GEN, ulRegRead);
+                       rtl92e_writel(dev, CPU_GEN, ulRegRead);
                } else {
-                       write_nic_dword(dev, WFCRC0, 0xffffffff);
-                       write_nic_dword(dev, WFCRC1, 0xffffffff);
-                       write_nic_dword(dev, WFCRC2, 0xffffffff);
+                       rtl92e_writel(dev, WFCRC0, 0xffffffff);
+                       rtl92e_writel(dev, WFCRC1, 0xffffffff);
+                       rtl92e_writel(dev, WFCRC2, 0xffffffff);
 
 
-                       write_nic_byte(dev, PMR, 0x5);
-                       write_nic_byte(dev, MacBlkCtrl, 0xa);
+                       rtl92e_writeb(dev, PMR, 0x5);
+                       rtl92e_writeb(dev, MacBlkCtrl, 0xa);
                }
        }
 
@@ -2185,8 +2186,8 @@ void rtl92e_update_ratr_table(struct net_device *dev)
        else if (!ieee->pHTInfo->bCurTxBW40MHz &&
                  ieee->pHTInfo->bCurShortGI20MHz)
                ratr_value |= 0x80000000;
-       write_nic_dword(dev, RATR0+rate_index*4, ratr_value);
-       write_nic_byte(dev, UFWP, 1);
+       rtl92e_writel(dev, RATR0+rate_index*4, ratr_value);
+       rtl92e_writeb(dev, UFWP, 1);
 }
 
 void
@@ -2230,7 +2231,7 @@ void rtl92e_enable_irq(struct net_device *dev)
 
        priv->irq_enabled = 1;
 
-       write_nic_dword(dev, INTA_MASK, priv->irq_mask[0]);
+       rtl92e_writel(dev, INTA_MASK, priv->irq_mask[0]);
 
 }
 
@@ -2238,7 +2239,7 @@ void rtl92e_disable_irq(struct net_device *dev)
 {
        struct r8192_priv *priv = (struct r8192_priv *)rtllib_priv(dev);
 
-       write_nic_dword(dev, INTA_MASK, 0);
+       rtl92e_writel(dev, INTA_MASK, 0);
 
        priv->irq_enabled = 0;
 }
@@ -2248,7 +2249,7 @@ void rtl92e_clear_irq(struct net_device *dev)
        u32 tmp = 0;
 
        tmp = rtl92e_readl(dev, ISR);
-       write_nic_dword(dev, ISR, tmp);
+       rtl92e_writel(dev, ISR, tmp);
 }
 
 
@@ -2256,7 +2257,7 @@ void rtl92e_enable_rx(struct net_device *dev)
 {
        struct r8192_priv *priv = (struct r8192_priv *)rtllib_priv(dev);
 
-       write_nic_dword(dev, RDQDA, priv->rx_ring_dma[RX_MPDU_QUEUE]);
+       rtl92e_writel(dev, RDQDA, priv->rx_ring_dma[RX_MPDU_QUEUE]);
 }
 
 static const u32 TX_DESC_BASE[] = {
@@ -2269,14 +2270,14 @@ void rtl92e_enable_tx(struct net_device *dev)
        u32 i;
 
        for (i = 0; i < MAX_TX_QUEUE_COUNT; i++)
-               write_nic_dword(dev, TX_DESC_BASE[i], priv->tx_ring[i].dma);
+               rtl92e_writel(dev, TX_DESC_BASE[i], priv->tx_ring[i].dma);
 }
 
 
 void rtl92e_ack_irq(struct net_device *dev, u32 *p_inta, u32 *p_intb)
 {
        *p_inta = rtl92e_readl(dev, ISR);
-       write_nic_dword(dev, ISR, *p_inta);
+       rtl92e_writel(dev, ISR, *p_inta);
 }
 
 bool rtl92e_is_rx_stuck(struct net_device *dev)
@@ -2387,9 +2388,3 @@ bool rtl92e_is_halfn_supported_by_ap(struct net_device *dev)
 
        return Reval;
 }
-
-void ActUpdateChannelAccessSetting(struct net_device *dev,
-       enum wireless_mode WirelessMode,
-       struct channel_access_setting *ChnlAccessSetting)
-{
-}