spin_lock_bh(&pmlmepriv->lock);
 
-       DBG_88E("Set BSSID under fw_state = 0x%08x\n", get_fwstate(pmlmepriv));
+       netdev_dbg(padapter->pnetdev, "Set BSSID under fw_state = 0x%08x\n",
+                  get_fwstate(pmlmepriv));
        if (check_fwstate(pmlmepriv, _FW_UNDER_SURVEY))
                goto handle_tkip_countermeasure;
        else if (check_fwstate(pmlmepriv, _FW_UNDER_LINKING))
 
        spin_lock_bh(&pmlmepriv->lock);
 
-       DBG_88E("Set SSID under fw_state = 0x%08x\n", get_fwstate(pmlmepriv));
+       netdev_dbg(padapter->pnetdev, "Set SSID under fw_state = 0x%08x\n",
+                  get_fwstate(pmlmepriv));
        if (check_fwstate(pmlmepriv, _FW_UNDER_SURVEY)) {
                goto handle_tkip_countermeasure;
        } else if (check_fwstate(pmlmepriv, _FW_UNDER_LINKING)) {
        if (*pold_state != networktype) {
                spin_lock_bh(&pmlmepriv->lock);
 
-               /* DBG_88E("change mode, old_mode =%d, new_mode =%d, fw_state = 0x%x\n", *pold_state, networktype, get_fwstate(pmlmepriv)); */
-
                if (*pold_state == Ndis802_11APMode) {
                        /* change to other mode from Ndis802_11APMode */
                        cur_network->join_res = -1;
                res = true;
        } else {
                if (rtw_is_scan_deny(padapter)) {
-                       DBG_88E(FUNC_ADPT_FMT": scan deny\n", FUNC_ADPT_ARG(padapter));
+                       netdev_dbg(padapter->pnetdev, "scan deny\n");
                        indicate_wx_scan_complete_event(padapter);
                        return _SUCCESS;
                }