staging: rtl8188eu:Remove rtw_zmalloc(), wrapper for kzalloc()
[deliverable/linux.git] / drivers / staging / rtl8188eu / os_dep / ioctl_linux.c
index f04aaa375f0ec5a13c4db3a78664c48621bc84e5..284a28ecca3b4c69e4481adffa3d37eb4cd607a8 100644 (file)
@@ -29,8 +29,6 @@
 #include <rtw_ioctl.h>
 #include <rtw_ioctl_set.h>
 #include <rtw_mp_ioctl.h>
-#include <usb_ops.h>
-#include <rtw_version.h>
 #include <rtl8188e_hal.h>
 
 #include <rtw_mp.h>
@@ -149,7 +147,7 @@ void indicate_wx_scan_complete_event(struct adapter *padapter)
 {
        union iwreq_data wrqu;
 
-       _rtw_memset(&wrqu, 0, sizeof(union iwreq_data));
+       memset(&wrqu, 0, sizeof(union iwreq_data));
        wireless_send_event(padapter->pnetdev, SIOCGIWSCAN, &wrqu, NULL);
 }
 
@@ -158,7 +156,7 @@ void rtw_indicate_wx_assoc_event(struct adapter *padapter)
        union iwreq_data wrqu;
        struct  mlme_priv *pmlmepriv = &padapter->mlmepriv;
 
-       _rtw_memset(&wrqu, 0, sizeof(union iwreq_data));
+       memset(&wrqu, 0, sizeof(union iwreq_data));
 
        wrqu.ap_addr.sa_family = ARPHRD_ETHER;
 
@@ -172,10 +170,10 @@ void rtw_indicate_wx_disassoc_event(struct adapter *padapter)
 {
        union iwreq_data wrqu;
 
-       _rtw_memset(&wrqu, 0, sizeof(union iwreq_data));
+       memset(&wrqu, 0, sizeof(union iwreq_data));
 
        wrqu.ap_addr.sa_family = ARPHRD_ETHER;
-       _rtw_memset(wrqu.ap_addr.sa_data, 0, ETH_ALEN);
+       memset(wrqu.ap_addr.sa_data, 0, ETH_ALEN);
 
        DBG_88E_LEVEL(_drv_always_, "indicate disassoc\n");
        wireless_send_event(padapter->pnetdev, SIOCGIWAP, &wrqu, NULL);
@@ -358,33 +356,33 @@ static char *translate_scan(struct adapter *padapter,
 
                if (wpa_len > 0) {
                        p = buf;
-                       _rtw_memset(buf, 0, MAX_WPA_IE_LEN);
+                       memset(buf, 0, MAX_WPA_IE_LEN);
                        p += sprintf(p, "wpa_ie=");
                        for (i = 0; i < wpa_len; i++)
                                p += sprintf(p, "%02x", wpa_ie[i]);
 
-                       _rtw_memset(&iwe, 0, sizeof(iwe));
+                       memset(&iwe, 0, sizeof(iwe));
                        iwe.cmd = IWEVCUSTOM;
                        iwe.u.data.length = strlen(buf);
                        start = iwe_stream_add_point(info, start, stop, &iwe, buf);
 
-                       _rtw_memset(&iwe, 0, sizeof(iwe));
+                       memset(&iwe, 0, sizeof(iwe));
                        iwe.cmd = IWEVGENIE;
                        iwe.u.data.length = wpa_len;
                        start = iwe_stream_add_point(info, start, stop, &iwe, wpa_ie);
                }
                if (rsn_len > 0) {
                        p = buf;
-                       _rtw_memset(buf, 0, MAX_WPA_IE_LEN);
+                       memset(buf, 0, MAX_WPA_IE_LEN);
                        p += sprintf(p, "rsn_ie=");
                        for (i = 0; i < rsn_len; i++)
                                p += sprintf(p, "%02x", rsn_ie[i]);
-                       _rtw_memset(&iwe, 0, sizeof(iwe));
+                       memset(&iwe, 0, sizeof(iwe));
                        iwe.cmd = IWEVCUSTOM;
                        iwe.u.data.length = strlen(buf);
                        start = iwe_stream_add_point(info, start, stop, &iwe, buf);
 
-                       _rtw_memset(&iwe, 0, sizeof(iwe));
+                       memset(&iwe, 0, sizeof(iwe));
                        iwe.cmd = IWEVGENIE;
                        iwe.u.data.length = rsn_len;
                        start = iwe_stream_add_point(info, start, stop, &iwe, rsn_ie);
@@ -520,7 +518,7 @@ static int wpa_set_encryption(struct net_device *dev, struct ieee_param *param,
                                RT_TRACE(_module_rtl871x_ioctl_os_c, _drv_err_, (" wpa_set_encryption: pwep allocate fail !!!\n"));
                                goto exit;
                        }
-                       _rtw_memset(pwep, 0, wep_total_len);
+                       memset(pwep, 0, wep_total_len);
                        pwep->KeyLength = wep_key_len;
                        pwep->Length = wep_total_len;
                        if (wep_key_len == 13) {
@@ -634,7 +632,7 @@ static int rtw_set_wpa_ie(struct adapter *padapter, char *pie, unsigned short ie
        }
 
        if (ielen) {
-               buf = rtw_zmalloc(ielen);
+               buf = kzalloc(ielen, GFP_KERNEL);
                if (buf == NULL) {
                        ret =  -ENOMEM;
                        goto exit;
@@ -955,14 +953,14 @@ static int rtw_wx_set_pmkid(struct net_device *dev,
                for (j = 0; j < NUM_PMKID_CACHE; j++) {
                        if (!memcmp(psecuritypriv->PMKIDList[j].Bssid, strIssueBssid, ETH_ALEN)) {
                                /*  BSSID is matched, the same AP => Remove this PMKID information and reset it. */
-                               _rtw_memset(psecuritypriv->PMKIDList[j].Bssid, 0x00, ETH_ALEN);
+                               memset(psecuritypriv->PMKIDList[j].Bssid, 0x00, ETH_ALEN);
                                psecuritypriv->PMKIDList[j].bUsed = false;
                                break;
                        }
               }
        } else if (pPMK->cmd == IW_PMKSA_FLUSH) {
                DBG_88E("[rtw_wx_set_pmkid] IW_PMKSA_FLUSH!\n");
-               _rtw_memset(&psecuritypriv->PMKIDList[0], 0x00, sizeof(struct rt_pmkid_list) * NUM_PMKID_CACHE);
+               memset(&psecuritypriv->PMKIDList[0], 0x00, sizeof(struct rt_pmkid_list) * NUM_PMKID_CACHE);
                psecuritypriv->PMKIDIndex = 0;
                ret = true;
        }
@@ -993,7 +991,7 @@ static int rtw_wx_get_range(struct net_device *dev,
        RT_TRACE(_module_rtl871x_mlme_c_, _drv_info_, ("rtw_wx_get_range. cmd_code =%x\n", info->cmd));
 
        wrqu->data.length = sizeof(*range);
-       _rtw_memset(range, 0, sizeof(*range));
+       memset(range, 0, sizeof(*range));
 
        /* Let's try to keep this struct in the same order as in
         * linux/include/wireless.h
@@ -1113,10 +1111,7 @@ static int rtw_wx_set_wap(struct net_device *dev,
        phead = get_list_head(queue);
        pmlmepriv->pscanned = phead->next;
 
-       while (1) {
-               if ((rtw_end_of_queue_search(phead, pmlmepriv->pscanned)) == true)
-                       break;
-
+       while (phead != pmlmepriv->pscanned) {
                pnetwork = container_of(pmlmepriv->pscanned, struct wlan_network, list);
 
                pmlmepriv->pscanned = pmlmepriv->pscanned->next;
@@ -1159,7 +1154,7 @@ static int rtw_wx_get_wap(struct net_device *dev,
 
        wrqu->ap_addr.sa_family = ARPHRD_ETHER;
 
-       _rtw_memset(wrqu->ap_addr.sa_data, 0, ETH_ALEN);
+       memset(wrqu->ap_addr.sa_data, 0, ETH_ALEN);
 
        RT_TRACE(_module_rtl871x_mlme_c_, _drv_info_, ("rtw_wx_get_wap\n"));
 
@@ -1168,7 +1163,7 @@ static int rtw_wx_get_wap(struct net_device *dev,
            ((check_fwstate(pmlmepriv, WIFI_AP_STATE)) == true))
                memcpy(wrqu->ap_addr.sa_data, pcur_bss->MacAddress, ETH_ALEN);
        else
-               _rtw_memset(wrqu->ap_addr.sa_data, 0, ETH_ALEN);
+               memset(wrqu->ap_addr.sa_data, 0, ETH_ALEN);
        return 0;
 }
 
@@ -1271,7 +1266,7 @@ static int rtw_wx_set_scan(struct net_device *dev, struct iw_request_info *a,
        }
 #endif /* CONFIG_88EU_P2P */
 
-       _rtw_memset(ssid, 0, sizeof(struct ndis_802_11_ssid)*RTW_SSID_SCAN_AMOUNT);
+       memset(ssid, 0, sizeof(struct ndis_802_11_ssid)*RTW_SSID_SCAN_AMOUNT);
 
        if (wrqu->data.length == sizeof(struct iw_scan_req)) {
                struct iw_scan_req *req = (struct iw_scan_req *)extra;
@@ -1404,10 +1399,7 @@ static int rtw_wx_get_scan(struct net_device *dev, struct iw_request_info *a,
        phead = get_list_head(queue);
        plist = phead->next;
 
-       while (1) {
-               if (rtw_end_of_queue_search(phead, plist))
-                       break;
-
+       while (phead != plist) {
                if ((stop - ev) < SCAN_ITEM_SIZE) {
                        ret = -E2BIG;
                        break;
@@ -1482,7 +1474,7 @@ static int rtw_wx_set_essid(struct net_device *dev,
                if (wrqu->essid.length != 33)
                        DBG_88E("ssid =%s, len =%d\n", extra, wrqu->essid.length);
 
-               _rtw_memset(&ndis_ssid, 0, sizeof(struct ndis_802_11_ssid));
+               memset(&ndis_ssid, 0, sizeof(struct ndis_802_11_ssid));
                ndis_ssid.SsidLength = len;
                memcpy(ndis_ssid.Ssid, extra, len);
                src_ssid = ndis_ssid.Ssid;
@@ -1492,14 +1484,7 @@ static int rtw_wx_set_essid(struct net_device *dev,
               phead = get_list_head(queue);
              pmlmepriv->pscanned = phead->next;
 
-               while (1) {
-                       if (rtw_end_of_queue_search(phead, pmlmepriv->pscanned) == true) {
-                               RT_TRACE(_module_rtl871x_ioctl_os_c, _drv_warning_,
-                                        ("rtw_wx_set_essid: scan_q is empty, set ssid to check if scanning again!\n"));
-
-                               break;
-                       }
-
+               while (phead != pmlmepriv->pscanned) {
                        pnetwork = container_of(pmlmepriv->pscanned, struct wlan_network, list);
 
                        pmlmepriv->pscanned = pmlmepriv->pscanned->next;
@@ -1787,7 +1772,7 @@ static int rtw_wx_set_enc(struct net_device *dev,
        struct pwrctrl_priv *pwrpriv = &padapter->pwrctrlpriv;
        DBG_88E("+rtw_wx_set_enc, flags = 0x%x\n", erq->flags);
 
-       _rtw_memset(&wep, 0, sizeof(struct ndis_802_11_wep));
+       memset(&wep, 0, sizeof(struct ndis_802_11_wep));
 
        key = erq->flags & IW_ENCODE_INDEX;
 
@@ -2076,10 +2061,10 @@ static int rtw_wx_set_enc_ext(struct net_device *dev,
        if (param == NULL)
                return -1;
 
-       _rtw_memset(param, 0, param_len);
+       memset(param, 0, param_len);
 
        param->cmd = IEEE_CMD_SET_ENCRYPTION;
-       _rtw_memset(param->sta_addr, 0xff, ETH_ALEN);
+       memset(param->sta_addr, 0xff, ETH_ALEN);
 
        switch (pext->alg) {
        case IW_ENCODE_ALG_NONE:
@@ -2180,15 +2165,15 @@ static int rtw_wx_read32(struct net_device *dev,
 
        switch (bytes) {
        case 1:
-               data32 = rtw_read8(padapter, addr);
+               data32 = usb_read8(padapter, addr);
                sprintf(extra, "0x%02X", data32);
                break;
        case 2:
-               data32 = rtw_read16(padapter, addr);
+               data32 = usb_read16(padapter, addr);
                sprintf(extra, "0x%04X", data32);
                break;
        case 4:
-               data32 = rtw_read32(padapter, addr);
+               data32 = usb_read32(padapter, addr);
                sprintf(extra, "0x%08X", data32);
                break;
        default:
@@ -2223,15 +2208,15 @@ static int rtw_wx_write32(struct net_device *dev,
 
        switch (bytes) {
        case 1:
-               rtw_write8(padapter, addr, (u8)data32);
+               usb_write8(padapter, addr, (u8)data32);
                DBG_88E(KERN_INFO "%s: addr = 0x%08X data = 0x%02X\n", __func__, addr, (u8)data32);
                break;
        case 2:
-               rtw_write16(padapter, addr, (u16)data32);
+               usb_write16(padapter, addr, (u16)data32);
                DBG_88E(KERN_INFO "%s: addr = 0x%08X data = 0x%04X\n", __func__, addr, (u16)data32);
                break;
        case 4:
-               rtw_write32(padapter, addr, data32);
+               usb_write32(padapter, addr, data32);
                DBG_88E(KERN_INFO "%s: addr = 0x%08X data = 0x%08X\n", __func__, addr, data32);
                break;
        default:
@@ -2354,13 +2339,13 @@ static void rtw_dbg_mode_hdl(struct adapter *padapter, u32 id, u8 *pdata, u32 le
                RegRWStruct = (struct mp_rw_reg *)pdata;
                switch (RegRWStruct->width) {
                case 1:
-                       RegRWStruct->value = rtw_read8(padapter, RegRWStruct->offset);
+                       RegRWStruct->value = usb_read8(padapter, RegRWStruct->offset);
                        break;
                case 2:
-                       RegRWStruct->value = rtw_read16(padapter, RegRWStruct->offset);
+                       RegRWStruct->value = usb_read16(padapter, RegRWStruct->offset);
                        break;
                case 4:
-                       RegRWStruct->value = rtw_read32(padapter, RegRWStruct->offset);
+                       RegRWStruct->value = usb_read32(padapter, RegRWStruct->offset);
                        break;
                default:
                        break;
@@ -2371,13 +2356,13 @@ static void rtw_dbg_mode_hdl(struct adapter *padapter, u32 id, u8 *pdata, u32 le
                RegRWStruct = (struct mp_rw_reg *)pdata;
                switch (RegRWStruct->width) {
                case 1:
-                       rtw_write8(padapter, RegRWStruct->offset, (u8)RegRWStruct->value);
+                       usb_write8(padapter, RegRWStruct->offset, (u8)RegRWStruct->value);
                        break;
                case 2:
-                       rtw_write16(padapter, RegRWStruct->offset, (u16)RegRWStruct->value);
+                       usb_write16(padapter, RegRWStruct->offset, (u16)RegRWStruct->value);
                        break;
                case 4:
-                       rtw_write32(padapter, RegRWStruct->offset, (u32)RegRWStruct->value);
+                       usb_write32(padapter, RegRWStruct->offset, (u32)RegRWStruct->value);
                        break;
                default:
                        break;
@@ -2565,10 +2550,7 @@ static int rtw_get_ap_info(struct net_device *dev,
        phead = get_list_head(queue);
        plist = phead->next;
 
-       while (1) {
-               if (rtw_end_of_queue_search(phead, plist) == true)
-                       break;
-
+       while (phead != plist) {
                pnetwork = container_of(plist, struct wlan_network, list);
 
                if (hwaddr_aton_i(data, bssid)) {
@@ -2849,7 +2831,7 @@ static int rtw_p2p_profilefound(struct net_device *dev,
                if (!rtw_p2p_chk_state(pwdinfo, P2P_STATE_NONE)) {
                        if (extra[0] == '0') {
                        /*      Remove all the profile information of wifidirect_info structure. */
-                       _rtw_memset(&pwdinfo->profileinfo[0], 0x00, sizeof(struct profile_info) * P2P_MAX_PERSISTENT_GROUP_NUM);
+                       memset(&pwdinfo->profileinfo[0], 0x00, sizeof(struct profile_info) * P2P_MAX_PERSISTENT_GROUP_NUM);
                        pwdinfo->profileindex = 0;
                } else {
                        if (pwdinfo->profileindex >= P2P_MAX_PERSISTENT_GROUP_NUM) {
@@ -2881,7 +2863,7 @@ static int rtw_p2p_setDN(struct net_device *dev,
        struct wifidirect_info *pwdinfo = &(padapter->wdinfo);
 
        DBG_88E("[%s] %s %d\n", __func__, extra, wrqu->data.length - 1);
-       _rtw_memset(pwdinfo->device_name, 0x00, WPS_MAX_DEVICE_NAME_LEN);
+       memset(pwdinfo->device_name, 0x00, WPS_MAX_DEVICE_NAME_LEN);
        memcpy(pwdinfo->device_name, extra, wrqu->data.length - 1);
        pwdinfo->device_name_len = wrqu->data.length - 1;
 
@@ -3068,10 +3050,7 @@ static int rtw_p2p_get_wps_configmethod(struct net_device *dev,
        phead = get_list_head(queue);
        plist = phead->next;
 
-       while (1) {
-               if (rtw_end_of_queue_search(phead, plist) == true)
-                       break;
-
+       while (phead != plist) {
                pnetwork = container_of(plist, struct wlan_network, list);
                if (!memcmp(pnetwork->network.MacAddress, peerMAC, ETH_ALEN)) {
                        u8 *wpsie;
@@ -3138,10 +3117,7 @@ static int rtw_p2p_get_go_device_address(struct net_device *dev,
        phead = get_list_head(queue);
        plist = phead->next;
 
-       while (1) {
-               if (rtw_end_of_queue_search(phead, plist) == true)
-                       break;
-
+       while (phead != plist) {
                pnetwork = container_of(plist, struct wlan_network, list);
                if (!memcmp(pnetwork->network.MacAddress, peerMAC, ETH_ALEN)) {
                        /*      Commented by Albert 2011/05/18 */
@@ -3154,7 +3130,7 @@ static int rtw_p2p_get_go_device_address(struct net_device *dev,
                                        /*      The P2P Device ID attribute is included in the Beacon frame. */
                                        /*      The P2P Device Info attribute is included in the probe response frame. */
 
-                                       _rtw_memset(attr_content, 0x00, 100);
+                                       memset(attr_content, 0x00, 100);
                                        if (rtw_get_p2p_attr_content(p2pie, p2pielen, P2P_ATTR_DEVICE_ID, attr_content, &attr_contentlen)) {
                                                /*      Handle the P2P Device ID attribute of Beacon first */
                                                blnMatch = 1;
@@ -3222,10 +3198,7 @@ static int rtw_p2p_get_device_type(struct net_device *dev,
        phead = get_list_head(queue);
        plist = phead->next;
 
-       while (1) {
-               if (rtw_end_of_queue_search(phead, plist) == true)
-                       break;
-
+       while (phead != plist) {
                pnetwork = container_of(plist, struct wlan_network, list);
                if (!memcmp(pnetwork->network.MacAddress, peerMAC, ETH_ALEN)) {
                        u8 *wpsie;
@@ -3301,10 +3274,7 @@ static int rtw_p2p_get_device_name(struct net_device *dev,
        phead = get_list_head(queue);
        plist = phead->next;
 
-       while (1) {
-               if (rtw_end_of_queue_search(phead, plist) == true)
-                       break;
-
+       while (phead != plist) {
                pnetwork = container_of(plist, struct wlan_network, list);
                if (!memcmp(pnetwork->network.MacAddress, peerMAC, ETH_ALEN)) {
                        u8 *wpsie;
@@ -3372,10 +3342,7 @@ static int rtw_p2p_get_invitation_procedure(struct net_device *dev,
        phead = get_list_head(queue);
        plist = phead->next;
 
-       while (1) {
-               if (rtw_end_of_queue_search(phead, plist) == true)
-                       break;
-
+       while (phead != plist) {
                pnetwork = container_of(plist, struct wlan_network, list);
                if (!memcmp(pnetwork->network.MacAddress, peerMAC, ETH_ALEN)) {
                        /*      Commented by Albert 20121226 */
@@ -3454,10 +3421,7 @@ static int rtw_p2p_connect(struct net_device *dev,
        phead = get_list_head(queue);
        plist = phead->next;
 
-       while (1) {
-               if (rtw_end_of_queue_search(phead, plist) == true)
-                       break;
-
+       while (phead != plist) {
                pnetwork = container_of(plist, struct wlan_network, list);
                if (!memcmp(pnetwork->network.MacAddress, peerMAC, ETH_ALEN)) {
                        uintPeerChannel = pnetwork->network.Configuration.DSConfig;
@@ -3470,8 +3434,8 @@ static int rtw_p2p_connect(struct net_device *dev,
        spin_unlock_bh(&pmlmepriv->scanned_queue.lock);
 
        if (uintPeerChannel) {
-               _rtw_memset(&pwdinfo->nego_req_info, 0x00, sizeof(struct tx_nego_req_info));
-               _rtw_memset(&pwdinfo->groupid_info, 0x00, sizeof(struct group_id_info));
+               memset(&pwdinfo->nego_req_info, 0x00, sizeof(struct tx_nego_req_info));
+               memset(&pwdinfo->groupid_info, 0x00, sizeof(struct group_id_info));
 
                pwdinfo->nego_req_info.peer_channel_num[0] = uintPeerChannel;
                memcpy(pwdinfo->nego_req_info.peerDevAddr, pnetwork->network.MacAddress, ETH_ALEN);
@@ -3533,11 +3497,11 @@ static int rtw_p2p_invite_req(struct net_device *dev,
        } else {
                /*      Reset the content of struct tx_invite_req_info */
                pinvite_req_info->benable = false;
-               _rtw_memset(pinvite_req_info->go_bssid, 0x00, ETH_ALEN);
-               _rtw_memset(pinvite_req_info->go_ssid, 0x00, WLAN_SSID_MAXLEN);
+               memset(pinvite_req_info->go_bssid, 0x00, ETH_ALEN);
+               memset(pinvite_req_info->go_ssid, 0x00, WLAN_SSID_MAXLEN);
                pinvite_req_info->ssidlen = 0x00;
                pinvite_req_info->operating_ch = pwdinfo->operating_channel;
-               _rtw_memset(pinvite_req_info->peer_macaddr, 0x00, ETH_ALEN);
+               memset(pinvite_req_info->peer_macaddr, 0x00, ETH_ALEN);
                pinvite_req_info->token = 3;
        }
 
@@ -3549,10 +3513,7 @@ static int rtw_p2p_invite_req(struct net_device *dev,
        phead = get_list_head(queue);
        plist = phead->next;
 
-       while (1) {
-               if (rtw_end_of_queue_search(phead, plist) == true)
-                       break;
-
+       while (phead != plist) {
                pnetwork = container_of(plist, struct wlan_network, list);
 
                /*      Commented by Albert 2011/05/18 */
@@ -3670,9 +3631,9 @@ static int rtw_p2p_prov_disc(struct net_device *dev,
                return ret;
        } else {
                /*      Reset the content of struct tx_provdisc_req_info excluded the wps_config_method_request. */
-               _rtw_memset(pwdinfo->tx_prov_disc_info.peerDevAddr, 0x00, ETH_ALEN);
-               _rtw_memset(pwdinfo->tx_prov_disc_info.peerIFAddr, 0x00, ETH_ALEN);
-               _rtw_memset(&pwdinfo->tx_prov_disc_info.ssid, 0x00, sizeof(struct ndis_802_11_ssid));
+               memset(pwdinfo->tx_prov_disc_info.peerDevAddr, 0x00, ETH_ALEN);
+               memset(pwdinfo->tx_prov_disc_info.peerIFAddr, 0x00, ETH_ALEN);
+               memset(&pwdinfo->tx_prov_disc_info.ssid, 0x00, sizeof(struct ndis_802_11_ssid));
                pwdinfo->tx_prov_disc_info.peer_channel_num[0] = 0;
                pwdinfo->tx_prov_disc_info.peer_channel_num[1] = 0;
                pwdinfo->tx_prov_disc_info.benable = false;
@@ -3699,9 +3660,7 @@ static int rtw_p2p_prov_disc(struct net_device *dev,
        phead = get_list_head(queue);
        plist = phead->next;
 
-       while (1) {
-               if (rtw_end_of_queue_search(phead, plist) == true)
-                       break;
+       while (phead != plist) {
 
                if (uintPeerChannel != 0)
                        break;
@@ -3947,14 +3906,14 @@ static int rtw_cta_test_start(struct net_device *dev,
                padapter->in_cta_test = 0;
 
        if (padapter->in_cta_test) {
-               u32 v = rtw_read32(padapter, REG_RCR);
+               u32 v = usb_read32(padapter, REG_RCR);
                v &= ~(RCR_CBSSID_DATA | RCR_CBSSID_BCN);/*  RCR_ADF */
-               rtw_write32(padapter, REG_RCR, v);
+               usb_write32(padapter, REG_RCR, v);
                DBG_88E("enable RCR_ADF\n");
        } else {
-               u32 v = rtw_read32(padapter, REG_RCR);
+               u32 v = usb_read32(padapter, REG_RCR);
                v |= RCR_CBSSID_DATA | RCR_CBSSID_BCN;/*  RCR_ADF */
-               rtw_write32(padapter, REG_RCR, v);
+               usb_write32(padapter, REG_RCR, v);
                DBG_88E("disable RCR_ADF\n");
        }
        return ret;
@@ -4026,14 +3985,14 @@ static void mac_reg_dump(struct adapter *padapter)
        for (i = 0x0; i < 0x300; i += 4) {
                if (j%4 == 1)
                        pr_info("0x%02x", i);
-               pr_info(" 0x%08x ", rtw_read32(padapter, i));
+               pr_info(" 0x%08x ", usb_read32(padapter, i));
                if ((j++)%4 == 0)
                        pr_info("\n");
        }
        for (i = 0x400; i < 0x800; i += 4) {
                if (j%4 == 1)
                        pr_info("0x%02x", i);
-               pr_info(" 0x%08x ", rtw_read32(padapter, i));
+               pr_info(" 0x%08x ", usb_read32(padapter, i));
                if ((j++)%4 == 0)
                        pr_info("\n");
        }
@@ -4047,7 +4006,7 @@ static void bb_reg_dump(struct adapter *padapter)
                if (j%4 == 1)
                        pr_info("0x%02x", i);
 
-               pr_info(" 0x%08x ", rtw_read32(padapter, i));
+               pr_info(" 0x%08x ", usb_read32(padapter, i));
                if ((j++)%4 == 0)
                        pr_info("\n");
        }
@@ -4110,29 +4069,29 @@ static int rtw_dbg_port(struct net_device *dev,
        case 0x70:/* read_reg */
                switch (minor_cmd) {
                case 1:
-                       DBG_88E("rtw_read8(0x%x) = 0x%02x\n", arg, rtw_read8(padapter, arg));
+                       DBG_88E("usb_read8(0x%x) = 0x%02x\n", arg, usb_read8(padapter, arg));
                        break;
                case 2:
-                       DBG_88E("rtw_read16(0x%x) = 0x%04x\n", arg, rtw_read16(padapter, arg));
+                       DBG_88E("usb_read16(0x%x) = 0x%04x\n", arg, usb_read16(padapter, arg));
                        break;
                case 4:
-                       DBG_88E("rtw_read32(0x%x) = 0x%08x\n", arg, rtw_read32(padapter, arg));
+                       DBG_88E("usb_read32(0x%x) = 0x%08x\n", arg, usb_read32(padapter, arg));
                        break;
                }
                break;
        case 0x71:/* write_reg */
                switch (minor_cmd) {
                case 1:
-                       rtw_write8(padapter, arg, extra_arg);
-                       DBG_88E("rtw_write8(0x%x) = 0x%02x\n", arg, rtw_read8(padapter, arg));
+                       usb_write8(padapter, arg, extra_arg);
+                       DBG_88E("usb_write8(0x%x) = 0x%02x\n", arg, usb_read8(padapter, arg));
                        break;
                case 2:
-                       rtw_write16(padapter, arg, extra_arg);
-                       DBG_88E("rtw_write16(0x%x) = 0x%04x\n", arg, rtw_read16(padapter, arg));
+                       usb_write16(padapter, arg, extra_arg);
+                       DBG_88E("usb_write16(0x%x) = 0x%04x\n", arg, usb_read16(padapter, arg));
                        break;
                case 4:
-                       rtw_write32(padapter, arg, extra_arg);
-                       DBG_88E("rtw_write32(0x%x) = 0x%08x\n", arg, rtw_read32(padapter, arg));
+                       usb_write32(padapter, arg, extra_arg);
+                       DBG_88E("usb_write32(0x%x) = 0x%08x\n", arg, usb_read32(padapter, arg));
                        break;
                }
                break;
@@ -4228,7 +4187,7 @@ static int rtw_dbg_port(struct net_device *dev,
                        if (_SUCCESS != rtw_IOL_exec_cmds_sync(padapter, xmit_frame, 5000, 0))
                                ret = -EPERM;
 
-                       final = rtw_read8(padapter, reg);
+                       final = usb_read8(padapter, reg);
                        if (start_value+write_num-1 == final)
                                DBG_88E("continuous IOL_CMD_WB_REG to 0x%x %u times Success, start:%u, final:%u\n", reg, write_num, start_value, final);
                        else
@@ -4257,7 +4216,7 @@ static int rtw_dbg_port(struct net_device *dev,
                        if (_SUCCESS != rtw_IOL_exec_cmds_sync(padapter, xmit_frame, 5000, 0))
                                ret = -EPERM;
 
-                       final = rtw_read16(padapter, reg);
+                       final = usb_read16(padapter, reg);
                        if (start_value+write_num-1 == final)
                                DBG_88E("continuous IOL_CMD_WW_REG to 0x%x %u times Success, start:%u, final:%u\n", reg, write_num, start_value, final);
                        else
@@ -4285,7 +4244,7 @@ static int rtw_dbg_port(struct net_device *dev,
                        if (_SUCCESS != rtw_IOL_exec_cmds_sync(padapter, xmit_frame, 5000, 0))
                                ret = -EPERM;
 
-                       final = rtw_read32(padapter, reg);
+                       final = usb_read32(padapter, reg);
                        if (start_value+write_num-1 == final)
                                DBG_88E("continuous IOL_CMD_WD_REG to 0x%x %u times Success, start:%u, final:%u\n",
                                        reg, write_num, start_value, final);
@@ -4312,7 +4271,7 @@ static int rtw_dbg_port(struct net_device *dev,
                                value = value | 0x10;
 
                        write_value = value | (value << 5);
-                       rtw_write16(padapter, 0x6d9, write_value);
+                       usb_write16(padapter, 0x6d9, write_value);
                }
                break;
        case 0x7a:
@@ -4404,7 +4363,7 @@ static int rtw_dbg_port(struct net_device *dev,
                                        phead = &(pstapriv->sta_hash[i]);
                                        plist = phead->next;
 
-                                       while ((rtw_end_of_queue_search(phead, plist)) == false) {
+                                       while (phead != plist) {
                                                psta = container_of(plist, struct sta_info, hash_list);
 
                                                plist = plist->next;
@@ -4449,10 +4408,6 @@ static int rtw_dbg_port(struct net_device *dev,
                        }
                        break;
                case 0x0f:
-                       if (extra_arg == 0) {
-                               DBG_88E("###### silent reset test.......#####\n");
-                               rtw_hal_sreset_reset(padapter);
-                       }
                        break;
                case 0x15:
                        {
@@ -4581,40 +4536,40 @@ static int rtw_dbg_port(struct net_device *dev,
                        break;
 
                case 0xfd:
-                       rtw_write8(padapter, 0xc50, arg);
-                       DBG_88E("wr(0xc50) = 0x%x\n", rtw_read8(padapter, 0xc50));
-                       rtw_write8(padapter, 0xc58, arg);
-                       DBG_88E("wr(0xc58) = 0x%x\n", rtw_read8(padapter, 0xc58));
+                       usb_write8(padapter, 0xc50, arg);
+                       DBG_88E("wr(0xc50) = 0x%x\n", usb_read8(padapter, 0xc50));
+                       usb_write8(padapter, 0xc58, arg);
+                       DBG_88E("wr(0xc58) = 0x%x\n", usb_read8(padapter, 0xc58));
                        break;
                case 0xfe:
-                       DBG_88E("rd(0xc50) = 0x%x\n", rtw_read8(padapter, 0xc50));
-                       DBG_88E("rd(0xc58) = 0x%x\n", rtw_read8(padapter, 0xc58));
+                       DBG_88E("rd(0xc50) = 0x%x\n", usb_read8(padapter, 0xc50));
+                       DBG_88E("rd(0xc58) = 0x%x\n", usb_read8(padapter, 0xc58));
                        break;
                case 0xff:
-                       DBG_88E("dbg(0x210) = 0x%x\n", rtw_read32(padapter, 0x210));
-                       DBG_88E("dbg(0x608) = 0x%x\n", rtw_read32(padapter, 0x608));
-                       DBG_88E("dbg(0x280) = 0x%x\n", rtw_read32(padapter, 0x280));
-                       DBG_88E("dbg(0x284) = 0x%x\n", rtw_read32(padapter, 0x284));
-                       DBG_88E("dbg(0x288) = 0x%x\n", rtw_read32(padapter, 0x288));
+                       DBG_88E("dbg(0x210) = 0x%x\n", usb_read32(padapter, 0x210));
+                       DBG_88E("dbg(0x608) = 0x%x\n", usb_read32(padapter, 0x608));
+                       DBG_88E("dbg(0x280) = 0x%x\n", usb_read32(padapter, 0x280));
+                       DBG_88E("dbg(0x284) = 0x%x\n", usb_read32(padapter, 0x284));
+                       DBG_88E("dbg(0x288) = 0x%x\n", usb_read32(padapter, 0x288));
 
-                       DBG_88E("dbg(0x664) = 0x%x\n", rtw_read32(padapter, 0x664));
+                       DBG_88E("dbg(0x664) = 0x%x\n", usb_read32(padapter, 0x664));
 
                        DBG_88E("\n");
 
-                       DBG_88E("dbg(0x430) = 0x%x\n", rtw_read32(padapter, 0x430));
-                       DBG_88E("dbg(0x438) = 0x%x\n", rtw_read32(padapter, 0x438));
+                       DBG_88E("dbg(0x430) = 0x%x\n", usb_read32(padapter, 0x430));
+                       DBG_88E("dbg(0x438) = 0x%x\n", usb_read32(padapter, 0x438));
 
-                       DBG_88E("dbg(0x440) = 0x%x\n", rtw_read32(padapter, 0x440));
+                       DBG_88E("dbg(0x440) = 0x%x\n", usb_read32(padapter, 0x440));
 
-                       DBG_88E("dbg(0x458) = 0x%x\n", rtw_read32(padapter, 0x458));
+                       DBG_88E("dbg(0x458) = 0x%x\n", usb_read32(padapter, 0x458));
 
-                       DBG_88E("dbg(0x484) = 0x%x\n", rtw_read32(padapter, 0x484));
-                       DBG_88E("dbg(0x488) = 0x%x\n", rtw_read32(padapter, 0x488));
+                       DBG_88E("dbg(0x484) = 0x%x\n", usb_read32(padapter, 0x484));
+                       DBG_88E("dbg(0x488) = 0x%x\n", usb_read32(padapter, 0x488));
 
-                       DBG_88E("dbg(0x444) = 0x%x\n", rtw_read32(padapter, 0x444));
-                       DBG_88E("dbg(0x448) = 0x%x\n", rtw_read32(padapter, 0x448));
-                       DBG_88E("dbg(0x44c) = 0x%x\n", rtw_read32(padapter, 0x44c));
-                       DBG_88E("dbg(0x450) = 0x%x\n", rtw_read32(padapter, 0x450));
+                       DBG_88E("dbg(0x444) = 0x%x\n", usb_read32(padapter, 0x444));
+                       DBG_88E("dbg(0x448) = 0x%x\n", usb_read32(padapter, 0x448));
+                       DBG_88E("dbg(0x44c) = 0x%x\n", usb_read32(padapter, 0x44c));
+                       DBG_88E("dbg(0x450) = 0x%x\n", usb_read32(padapter, 0x450));
                        break;
                }
                break;
@@ -4766,13 +4721,13 @@ static u8 set_pairwise_key(struct adapter *padapter, struct sta_info *psta)
        struct cmd_priv *pcmdpriv = &padapter->cmdpriv;
        u8 res = _SUCCESS;
 
-       ph2c = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj));
+       ph2c = kzalloc(sizeof(struct cmd_obj), GFP_KERNEL);
        if (ph2c == NULL) {
                res = _FAIL;
                goto exit;
        }
 
-       psetstakey_para = (struct set_stakey_parm *)rtw_zmalloc(sizeof(struct set_stakey_parm));
+       psetstakey_para = kzalloc(sizeof(struct set_stakey_parm), GFP_KERNEL);
        if (psetstakey_para == NULL) {
                kfree(ph2c);
                res = _FAIL;
@@ -4804,19 +4759,19 @@ static int set_group_key(struct adapter *padapter, u8 *key, u8 alg, int keyid)
 
        DBG_88E("%s\n", __func__);
 
-       pcmd = (struct cmd_obj *)rtw_zmalloc(sizeof(struct      cmd_obj));
+       pcmd = kzalloc(sizeof(struct    cmd_obj), GFP_KERNEL);
        if (pcmd == NULL) {
                res = _FAIL;
                goto exit;
        }
-       psetkeyparm = (struct setkey_parm *)rtw_zmalloc(sizeof(struct setkey_parm));
+       psetkeyparm = kzalloc(sizeof(struct setkey_parm), GFP_KERNEL);
        if (psetkeyparm == NULL) {
                kfree(pcmd);
                res = _FAIL;
                goto exit;
        }
 
-       _rtw_memset(psetkeyparm, 0, sizeof(struct setkey_parm));
+       memset(psetkeyparm, 0, sizeof(struct setkey_parm));
 
        psetkeyparm->keyid = (u8)keyid;
 
@@ -4846,7 +4801,7 @@ static int set_group_key(struct adapter *padapter, u8 *key, u8 alg, int keyid)
        pcmd->rsp = NULL;
        pcmd->rspsz = 0;
 
-       _rtw_init_listhead(&pcmd->list);
+       INIT_LIST_HEAD(&pcmd->list);
 
        res = rtw_enqueue_cmd(pcmdpriv, pcmd);
 
@@ -4931,7 +4886,7 @@ static int rtw_set_encryption(struct net_device *dev, struct ieee_param *param,
                                goto exit;
                        }
 
-                       _rtw_memset(pwep, 0, wep_total_len);
+                       memset(pwep, 0, wep_total_len);
 
                        pwep->KeyLength = wep_key_len;
                        pwep->Length = wep_total_len;
@@ -5221,7 +5176,7 @@ static int rtw_del_sta(struct net_device *dev, struct ieee_param *param)
        psta = rtw_get_stainfo(pstapriv, param->sta_addr);
        if (psta) {
                spin_lock_bh(&pstapriv->asoc_list_lock);
-               if (!rtw_is_list_empty(&psta->asoc_list)) {
+               if (!list_empty(&psta->asoc_list)) {
                        rtw_list_delete(&psta->asoc_list);
                        pstapriv->asoc_list_cnt--;
                        updated = ap_free_sta(padapter, psta, true, WLAN_REASON_DEAUTH_LEAVING);
@@ -5717,12 +5672,12 @@ static int rtw_mp_efuse_get(struct net_device *dev,
        pEfuseHal = &haldata->EfuseHal;
 
        err = 0;
-       data = _rtw_zmalloc(EFUSE_BT_MAX_MAP_LEN);
+       data = kzalloc(EFUSE_BT_MAX_MAP_LEN, GFP_KERNEL);
        if (data == NULL) {
                err = -ENOMEM;
                goto exit;
        }
-       rawdata = _rtw_zmalloc(EFUSE_BT_MAX_MAP_LEN);
+       rawdata = kzalloc(EFUSE_BT_MAX_MAP_LEN, GFP_KERNEL);
        if (rawdata == NULL) {
                err = -ENOMEM;
                goto exit;
@@ -5805,7 +5760,7 @@ static int rtw_mp_efuse_get(struct net_device *dev,
                }
                DBG_88E("%s: cnts =%d\n", __func__, cnts);
 
-               EFUSE_GetEfuseDefinition(padapter, EFUSE_WIFI, TYPE_AVAILABLE_EFUSE_BYTES_TOTAL, (void *)&max_available_size, false);
+               EFUSE_GetEfuseDefinition(padapter, EFUSE_WIFI, TYPE_AVAILABLE_EFUSE_BYTES_TOTAL, (void *)&max_available_size);
                if ((addr + cnts) > max_available_size) {
                        DBG_88E("%s: addr(0x%X)+cnts(%d) parameter error!\n", __func__, addr, cnts);
                        err = -EINVAL;
@@ -5844,7 +5799,7 @@ static int rtw_mp_efuse_get(struct net_device *dev,
        } else if (strcmp(tmp[0], "mac") == 0) {
                cnts = 6;
 
-               EFUSE_GetEfuseDefinition(padapter, EFUSE_WIFI, TYPE_AVAILABLE_EFUSE_BYTES_TOTAL, (void *)&max_available_size, false);
+               EFUSE_GetEfuseDefinition(padapter, EFUSE_WIFI, TYPE_AVAILABLE_EFUSE_BYTES_TOTAL, (void *)&max_available_size);
                if ((addr + cnts) > max_available_size) {
                        DBG_88E("%s: addr(0x%02x)+cnts(%d) parameter error!\n", __func__, addr, cnts);
                        err = -EFAULT;
@@ -5866,7 +5821,7 @@ static int rtw_mp_efuse_get(struct net_device *dev,
        } else if (strcmp(tmp[0], "vidpid") == 0) {
                cnts = 4;
 
-               EFUSE_GetEfuseDefinition(padapter, EFUSE_WIFI, TYPE_AVAILABLE_EFUSE_BYTES_TOTAL, (void *)&max_available_size, false);
+               EFUSE_GetEfuseDefinition(padapter, EFUSE_WIFI, TYPE_AVAILABLE_EFUSE_BYTES_TOTAL, (void *)&max_available_size);
                if ((addr + cnts) > max_available_size) {
                        DBG_88E("%s: addr(0x%02x)+cnts(%d) parameter error!\n", __func__, addr, cnts);
                        err = -EFAULT;
@@ -5888,77 +5843,6 @@ static int rtw_mp_efuse_get(struct net_device *dev,
                efuse_GetCurrentSize(padapter, &raw_cursize);
                raw_maxsize = efuse_GetMaxSize(padapter);
                sprintf(extra, "[available raw size] = %d bytes", raw_maxsize-raw_cursize);
-       } else if (strcmp(tmp[0], "btfmap") == 0) {
-               mapLen = EFUSE_BT_MAX_MAP_LEN;
-               if (rtw_BT_efuse_map_read(padapter, 0, mapLen, pEfuseHal->BTEfuseInitMap) == _FAIL) {
-                       DBG_88E("%s: rtw_BT_efuse_map_read Fail!!\n", __func__);
-                       err = -EFAULT;
-                       goto exit;
-               }
-
-               sprintf(extra, "\n");
-               for (i = 0; i < 512; i += 16) {
-                       /*  set 512 because the iwpriv's extra size have limit 0x7FF */
-                       sprintf(extra, "%s0x%03x\t", extra, i);
-                       for (j = 0; j < 8; j++)
-                               sprintf(extra, "%s%02X ", extra, pEfuseHal->BTEfuseInitMap[i+j]);
-                       sprintf(extra, "%s\t", extra);
-                       for (; j < 16; j++)
-                               sprintf(extra, "%s%02X ", extra, pEfuseHal->BTEfuseInitMap[i+j]);
-                       sprintf(extra, "%s\n", extra);
-               }
-       } else if (strcmp(tmp[0], "btbmap") == 0) {
-               mapLen = EFUSE_BT_MAX_MAP_LEN;
-               if (rtw_BT_efuse_map_read(padapter, 0, mapLen, pEfuseHal->BTEfuseInitMap) == _FAIL) {
-                       DBG_88E("%s: rtw_BT_efuse_map_read Fail!!\n", __func__);
-                       err = -EFAULT;
-                       goto exit;
-               }
-
-               sprintf(extra, "\n");
-               for (i = 512; i < 1024; i += 16) {
-                       sprintf(extra, "%s0x%03x\t", extra, i);
-                       for (j = 0; j < 8; j++)
-                               sprintf(extra, "%s%02X ", extra, pEfuseHal->BTEfuseInitMap[i+j]);
-                       sprintf(extra, "%s\t", extra);
-                       for (; j < 16; j++)
-                               sprintf(extra, "%s%02X ", extra, pEfuseHal->BTEfuseInitMap[i+j]);
-                       sprintf(extra, "%s\n", extra);
-               }
-       } else if (strcmp(tmp[0], "btrmap") == 0) {
-               if ((tmp[1] == NULL) || (tmp[2] == NULL)) {
-                       err = -EINVAL;
-                       goto exit;
-               }
-
-               /*  rmap addr cnts */
-               addr = simple_strtoul(tmp[1], &ptmp, 16);
-               DBG_88E("%s: addr = 0x%X\n", __func__, addr);
-
-               cnts = simple_strtoul(tmp[2], &ptmp, 10);
-               if (cnts == 0) {
-                       DBG_88E("%s: btrmap Fail!! cnts error!\n", __func__);
-                       err = -EINVAL;
-                       goto exit;
-               }
-               DBG_88E("%s: cnts =%d\n", __func__, cnts);
-
-               EFUSE_GetEfuseDefinition(padapter, EFUSE_BT, TYPE_AVAILABLE_EFUSE_BYTES_TOTAL, (void *)&max_available_size, false);
-               if ((addr + cnts) > max_available_size) {
-                       DBG_88E("%s: addr(0x%X)+cnts(%d) parameter error!\n", __func__, addr, cnts);
-                       err = -EFAULT;
-                       goto exit;
-               }
-
-               if (rtw_BT_efuse_map_read(padapter, addr, cnts, data) == _FAIL) {
-                       DBG_88E("%s: rtw_BT_efuse_map_read error!!\n", __func__);
-                       err = -EFAULT;
-                       goto exit;
-               }
-
-               *extra = 0;
-               for (i = 0; i < cnts; i++)
-                       sprintf(extra, "%s 0x%02X ", extra, data[i]);
        } else if (strcmp(tmp[0], "btffake") == 0) {
                sprintf(extra, "\n");
                for (i = 0; i < 512; i += 16) {
@@ -6032,7 +5916,7 @@ static int rtw_mp_efuse_set(struct net_device *dev,
        haldata = GET_HAL_DATA(padapter);
        pEfuseHal = &haldata->EfuseHal;
        err = 0;
-       setdata = _rtw_zmalloc(1024);
+       setdata = kzalloc(1024, GFP_KERNEL);
        if (setdata == NULL) {
                err = -ENOMEM;
                goto exit;
@@ -6099,7 +5983,7 @@ static int rtw_mp_efuse_set(struct net_device *dev,
                for (jj = 0, kk = 0; jj < cnts; jj++, kk += 2)
                        setdata[jj] = key_2char2num(tmp[2][kk], tmp[2][kk + 1]);
                /* Change to check TYPE_EFUSE_MAP_LEN, because 8188E raw 256, logic map over 256. */
-               EFUSE_GetEfuseDefinition(padapter, EFUSE_WIFI, TYPE_EFUSE_MAP_LEN, (void *)&max_available_size, false);
+               EFUSE_GetEfuseDefinition(padapter, EFUSE_WIFI, TYPE_EFUSE_MAP_LEN, (void *)&max_available_size);
                if ((addr+cnts) > max_available_size) {
                        DBG_88E("%s: addr(0x%X)+cnts(%d) parameter error!\n", __func__, addr, cnts);
                        err = -EFAULT;
@@ -6174,7 +6058,7 @@ static int rtw_mp_efuse_set(struct net_device *dev,
                for (jj = 0, kk = 0; jj < cnts; jj++, kk += 2)
                        setdata[jj] = key_2char2num(tmp[1][kk], tmp[1][kk + 1]);
                /* Change to check TYPE_EFUSE_MAP_LEN, because 8188E raw 256, logic map over 256. */
-               EFUSE_GetEfuseDefinition(padapter, EFUSE_WIFI, TYPE_EFUSE_MAP_LEN, (void *)&max_available_size, false);
+               EFUSE_GetEfuseDefinition(padapter, EFUSE_WIFI, TYPE_EFUSE_MAP_LEN, (void *)&max_available_size);
                if ((addr+cnts) > max_available_size) {
                        DBG_88E("%s: addr(0x%X)+cnts(%d) parameter error!\n", __func__, addr, cnts);
                        err = -EFAULT;
@@ -6212,7 +6096,7 @@ static int rtw_mp_efuse_set(struct net_device *dev,
                for (jj = 0, kk = 0; jj < cnts; jj++, kk += 2)
                        setdata[jj] = key_2char2num(tmp[1][kk], tmp[1][kk + 1]);
 
-               EFUSE_GetEfuseDefinition(padapter, EFUSE_WIFI, TYPE_AVAILABLE_EFUSE_BYTES_TOTAL, (void *)&max_available_size, false);
+               EFUSE_GetEfuseDefinition(padapter, EFUSE_WIFI, TYPE_AVAILABLE_EFUSE_BYTES_TOTAL, (void *)&max_available_size);
                if ((addr+cnts) > max_available_size) {
                        DBG_88E("%s: addr(0x%X)+cnts(%d) parameter error!\n", __func__, addr, cnts);
                        err = -EFAULT;
@@ -6251,18 +6135,13 @@ static int rtw_mp_efuse_set(struct net_device *dev,
                for (jj = 0, kk = 0; jj < cnts; jj++, kk += 2)
                        setdata[jj] = key_2char2num(tmp[2][kk], tmp[2][kk + 1]);
 
-               EFUSE_GetEfuseDefinition(padapter, EFUSE_BT, TYPE_AVAILABLE_EFUSE_BYTES_TOTAL, (void *)&max_available_size, false);
+               EFUSE_GetEfuseDefinition(padapter, EFUSE_BT, TYPE_AVAILABLE_EFUSE_BYTES_TOTAL, (void *)&max_available_size);
                if ((addr+cnts) > max_available_size) {
                        DBG_88E("%s: addr(0x%X)+cnts(%d) parameter error!\n", __func__, addr, cnts);
                        err = -EFAULT;
                        goto exit;
                }
 
-               if (rtw_BT_efuse_map_write(padapter, addr, cnts, setdata) == _FAIL) {
-                       DBG_88E("%s: rtw_BT_efuse_map_write error!!\n", __func__);
-                       err = -EFAULT;
-                       goto exit;
-               }
        } else if (strcmp(tmp[0], "btwfake") == 0) {
                if ((tmp[1] == NULL) || (tmp[2] == NULL)) {
                        err = -EINVAL;
@@ -6289,13 +6168,6 @@ static int rtw_mp_efuse_set(struct net_device *dev,
 
                for (jj = 0, kk = 0; jj < cnts; jj++, kk += 2)
                        pEfuseHal->fakeBTEfuseModifiedMap[addr+jj] = key_2char2num(tmp[2][kk], tmp[2][kk + 1]);
-       } else if (strcmp(tmp[0], "btdumpfake") == 0) {
-               if (rtw_BT_efuse_map_read(padapter, 0, EFUSE_BT_MAX_MAP_LEN, pEfuseHal->fakeBTEfuseModifiedMap) == _SUCCESS) {
-                       DBG_88E("%s: BT read all map success\n", __func__);
-               } else {
-                       DBG_88E("%s: BT read all map Fail!\n", __func__);
-                       err = -EFAULT;
-               }
        } else if (strcmp(tmp[0], "wldumpfake") == 0) {
                if (rtw_efuse_map_read(padapter, 0, EFUSE_BT_MAX_MAP_LEN,  pEfuseHal->fakeEfuseModifiedMap) == _SUCCESS) {
                        DBG_88E("%s: BT read all map success\n", __func__);
@@ -6306,19 +6178,14 @@ static int rtw_mp_efuse_set(struct net_device *dev,
        } else if (strcmp(tmp[0], "btfk2map") == 0) {
                memcpy(pEfuseHal->BTEfuseModifiedMap, pEfuseHal->fakeBTEfuseModifiedMap, EFUSE_BT_MAX_MAP_LEN);
 
-               EFUSE_GetEfuseDefinition(padapter, EFUSE_BT, TYPE_AVAILABLE_EFUSE_BYTES_TOTAL, (void *)&max_available_size, false);
+               EFUSE_GetEfuseDefinition(padapter, EFUSE_BT, TYPE_AVAILABLE_EFUSE_BYTES_TOTAL, (void *)&max_available_size);
                if (max_available_size < 1) {
                        err = -EFAULT;
                        goto exit;
                }
 
-               if (rtw_BT_efuse_map_write(padapter, 0x00, EFUSE_BT_MAX_MAP_LEN, pEfuseHal->fakeBTEfuseModifiedMap) == _FAIL) {
-                       DBG_88E("%s: rtw_BT_efuse_map_write error!\n", __func__);
-                       err = -EFAULT;
-                       goto exit;
-               }
        } else if (strcmp(tmp[0], "wlfk2map") == 0) {
-               EFUSE_GetEfuseDefinition(padapter, EFUSE_WIFI, TYPE_AVAILABLE_EFUSE_BYTES_TOTAL, (void *)&max_available_size, false);
+               EFUSE_GetEfuseDefinition(padapter, EFUSE_WIFI, TYPE_AVAILABLE_EFUSE_BYTES_TOTAL, (void *)&max_available_size);
                if (max_available_size < 1) {
                        err = -EFAULT;
                        goto exit;
@@ -6419,7 +6286,7 @@ static int rtw_mp_write_reg(struct net_device *dev,
                        ret = -EINVAL;
                        break;
                }
-               rtw_write8(padapter, addr, data);
+               usb_write8(padapter, addr, data);
                break;
        case 'w':
                /*  2 bytes */
@@ -6427,11 +6294,11 @@ static int rtw_mp_write_reg(struct net_device *dev,
                        ret = -EINVAL;
                        break;
                }
-               rtw_write16(padapter, addr, data);
+               usb_write16(padapter, addr, data);
                break;
        case 'd':
                /*  4 bytes */
-               rtw_write32(padapter, addr, data);
+               usb_write32(padapter, addr, data);
                break;
        default:
                ret = -EINVAL;
@@ -6471,9 +6338,9 @@ static int rtw_mp_read_reg(struct net_device *dev,
                kfree(input);
                return -EFAULT;
        }
-       _rtw_memset(data, 0, 20);
-       _rtw_memset(tmp, 0, 20);
-       _rtw_memset(extra, 0, wrqu->length);
+       memset(data, 0, 20);
+       memset(tmp, 0, 20);
+       memset(extra, 0, wrqu->length);
 
        pch = input;
        pnext = strpbrk(pch, ",.-");
@@ -6499,12 +6366,12 @@ static int rtw_mp_read_reg(struct net_device *dev,
        switch (width) {
        case 'b':
                /*  1 byte */
-               sprintf(extra, "%d\n",  rtw_read8(padapter, addr));
+               sprintf(extra, "%d\n",  usb_read8(padapter, addr));
                wrqu->length = strlen(extra);
                break;
        case 'w':
                /*  2 bytes */
-               sprintf(data, "%04x\n", rtw_read16(padapter, addr));
+               sprintf(data, "%04x\n", usb_read16(padapter, addr));
                for (i = 0; i <= strlen(data); i++) {
                        if (i%2 == 0) {
                                tmp[j] = ' ';
@@ -6535,7 +6402,7 @@ static int rtw_mp_read_reg(struct net_device *dev,
                break;
        case 'd':
                /*  4 bytes */
-               sprintf(data, "%08x", rtw_read32(padapter, addr));
+               sprintf(data, "%08x", usb_read32(padapter, addr));
                /* add read data format blank */
                for (i = 0; i <= strlen(data); i++) {
                        if (i%2 == 0) {
@@ -6599,7 +6466,7 @@ static int rtw_mp_read_reg(struct net_device *dev,
        if (data > 0xFFFFF)
                return -EINVAL;
 
-       _rtw_memset(extra, 0, wrqu->length);
+       memset(extra, 0, wrqu->length);
 
        write_rfreg(padapter, path, addr, data);
 
@@ -6644,7 +6511,7 @@ static int rtw_mp_read_rf(struct net_device *dev,
        if (addr > 0xFF)
                return -EINVAL;
 
-       _rtw_memset(extra, 0, wrqu->length);
+       memset(extra, 0, wrqu->length);
 
        sprintf(data, "%08x", read_rfreg(padapter, path, addr));
        /* add read data format blank */
@@ -6723,9 +6590,10 @@ static int rtw_mp_rate(struct net_device *dev,
                        struct iw_request_info *info,
                        struct iw_point *wrqu, char *extra)
 {
-       u32 rate = MPT_RATE_1M;
+       unsigned long rate = MPT_RATE_1M;
        char    *input = kmalloc(wrqu->length, GFP_KERNEL);
        struct adapter *padapter = rtw_netdev_priv(dev);
+       int status;
 
        if (!input)
                return -ENOMEM;
@@ -6733,8 +6601,12 @@ static int rtw_mp_rate(struct net_device *dev,
                kfree(input);
                return -EFAULT;
        }
-       rate = rtw_atoi(input);
-       sprintf(extra, "Set data rate to %d", rate);
+
+       status = kstrtoul(input, 0, &rate);
+       if (status)
+               return status;
+
+       sprintf(extra, "Set data rate to %lu", rate);
        kfree(input);
        if (rate <= 0x7f)
                rate = wifirate2_ratetbl_inx((u8)rate);
@@ -6756,8 +6628,9 @@ static int rtw_mp_channel(struct net_device *dev,
                        struct iw_point *wrqu, char *extra)
 {
        struct adapter *padapter = rtw_netdev_priv(dev);
-       char    *input = kmalloc(wrqu->length, GFP_KERNEL);
-       u32     channel = 1;
+       char *input = kmalloc(wrqu->length, GFP_KERNEL);
+       unsigned long channel = 1;
+       int status;
 
        if (!input)
                return -ENOMEM;
@@ -6765,8 +6638,12 @@ static int rtw_mp_channel(struct net_device *dev,
                kfree(input);
                return -EFAULT;
        }
-       channel = rtw_atoi(input);
-       sprintf(extra, "Change channel %d to channel %d", padapter->mppriv.channel, channel);
+
+       status = kstrtoul(input, 0, &channel);
+       if (status)
+               return status;
+
+       sprintf(extra, "Change channel %d to channel %lu", padapter->mppriv.channel, channel);
 
        padapter->mppriv.channel = channel;
        Hal_SetChannel(padapter);
@@ -6883,7 +6760,7 @@ static int rtw_mp_ant_rx(struct net_device *dev,
                kfree(input);
                return -EFAULT;
        }
-       _rtw_memset(extra, 0, wrqu->length);
+       memset(extra, 0, wrqu->length);
 
        sprintf(extra, "switch Rx antenna to %s", input);
 
@@ -6936,7 +6813,7 @@ static int rtw_mp_ctx(struct net_device *dev,
        if (rv != 2)
                return -EINVAL;
 
-       _rtw_memset(extra, '\0', sizeof(*extra));
+       memset(extra, '\0', sizeof(*extra));
 
        if (stop == 0) {
                bStartTest = 0; /*  To set Stop */
@@ -6976,7 +6853,7 @@ static int rtw_mp_ctx(struct net_device *dev,
                        pmp_priv->tx.payload = 2;
                        pattrib = &pmp_priv->tx.attrib;
                        pattrib->pktlen = 1500;
-                       _rtw_memset(pattrib->dst, 0xFF, ETH_ALEN);
+                       memset(pattrib->dst, 0xFF, ETH_ALEN);
                        SetPacketTx(padapter);
                } else {
                        return -EFAULT;
@@ -7083,7 +6960,7 @@ static int rtw_mp_arx(struct net_device *dev,
                OFDM_FA = read_bbreg(padapter, 0xda4, 0x0000FFFF);
                OFDM_FA = read_bbreg(padapter, 0xda4, 0xFFFF0000);
                OFDM_FA = read_bbreg(padapter, 0xda8, 0x0000FFFF);
-               CCK_FA = (rtw_read8(padapter, 0xa5b)<<8) | (rtw_read8(padapter, 0xa5c));
+               CCK_FA = (usb_read8(padapter, 0xa5b)<<8) | (usb_read8(padapter, 0xa5c));
 
                sprintf(extra, "Phy Received packet OK:%d CRC error:%d FA Counter: %d", cckok+ofdmok+htok, cckcrc+ofdmcrc+htcrc, OFDM_FA+CCK_FA);
        }
@@ -7104,7 +6981,7 @@ static int rtw_mp_trx_query(struct net_device *dev,
        rxok = padapter->mppriv.rx_pktcount;
        rxfail = padapter->mppriv.rx_crcerrpktcount;
 
-       _rtw_memset(extra, '\0', 128);
+       memset(extra, '\0', 128);
 
        sprintf(extra, "Tx OK:%d, Tx Fail:%d, Rx OK:%d, CRC error:%d ", txok, txfail, rxok, rxfail);
 
@@ -7129,7 +7006,7 @@ static int rtw_mp_pwrtrk(struct net_device *dev,
                ret = -EFAULT;
                goto exit;
        }
-       _rtw_memset(extra, 0, wrqu->length);
+       memset(extra, 0, wrqu->length);
 
        enable = 1;
        if (wrqu->length > 1) {/*  not empty string */
@@ -7203,7 +7080,7 @@ static int rtw_mp_thermal(struct net_device *dev,
        Hal_GetThermalMeter(padapter, &val);
 
        if (bwrite == 0) {
-               EFUSE_GetEfuseDefinition(padapter, EFUSE_WIFI, TYPE_AVAILABLE_EFUSE_BYTES_TOTAL, (void *)&max_available_size, false);
+               EFUSE_GetEfuseDefinition(padapter, EFUSE_WIFI, TYPE_AVAILABLE_EFUSE_BYTES_TOTAL, (void *)&max_available_size);
                if (2 > max_available_size) {
                        DBG_88E("no available efuse!\n");
                        return -EFAULT;
@@ -7258,14 +7135,14 @@ static int rtw_mp_dump(struct net_device *dev,
                for (i = 0x0; i < 0x300; i += 4) {
                        if (j%4 == 1)
                                DBG_88E("0x%02x", i);
-                       DBG_88E(" 0x%08x ", rtw_read32(padapter, i));
+                       DBG_88E(" 0x%08x ", usb_read32(padapter, i));
                        if ((j++)%4 == 0)
                                DBG_88E("\n");
                }
                for (i = 0x400; i < 0x1000; i += 4) {
                        if (j%4 == 1)
                                DBG_88E("0x%02x", i);
-                       DBG_88E(" 0x%08x ", rtw_read32(padapter, i));
+                       DBG_88E(" 0x%08x ", usb_read32(padapter, i));
                        if ((j++)%4 == 0)
                                DBG_88E("\n");
                }
@@ -7561,7 +7438,7 @@ static int rtw_test(
        DBG_88E("+%s\n", __func__);
        len = wrqu->data.length;
 
-       pbuf = (u8 *)rtw_zmalloc(len);
+       pbuf = kzalloc(len, GFP_KERNEL);
        if (pbuf == NULL) {
                DBG_88E("%s: no memory!\n", __func__);
                return -ENOMEM;
@@ -7906,7 +7783,7 @@ static int rtw_ioctl_wext_private(struct net_device *dev, union iwreq_data *wrq_
        memcpy(&wdata, wrq_data, sizeof(wdata));
 
        input_len = wdata.data.length;
-       input = rtw_zmalloc(input_len);
+       input = kzalloc(input_len, GFP_KERNEL);
        if (NULL == input)
                return -ENOMEM;
        if (copy_from_user(input, wdata.data.pointer, input_len)) {
@@ -7973,7 +7850,7 @@ static int rtw_ioctl_wext_private(struct net_device *dev, union iwreq_data *wrq_
                k = j;
        }
 
-       buffer = rtw_zmalloc(4096);
+       buffer = kzalloc(4096, GFP_KERNEL);
        if (NULL == buffer) {
                err = -ENOMEM;
                goto exit;
@@ -8122,7 +7999,7 @@ static int rtw_ioctl_wext_private(struct net_device *dev, union iwreq_data *wrq_
                else
                        n = wdata.data.length;
 
-               output = rtw_zmalloc(4096);
+               output = kzalloc(4096, GFP_KERNEL);
                if (NULL == output) {
                        err =  -ENOMEM;
                        goto exit;
This page took 0.044388 seconds and 5 git commands to generate.