if (!pmlmepriv->LinkDetectInfo.bBusyTraffic ||
                    pmlmepriv->to_roaming > 0) {
-                       RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_info_, ("rtw_do_join(): site survey if scanned_queue is empty\n."));
+                       RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_info_, ("%s: site survey if scanned_queue is empty\n.", __func__));
                        /*  submit site_survey_cmd */
                        ret = rtw_sitesurvey_cmd(padapter, &pmlmepriv->assoc_ssid, 1, NULL, 0);
                        if (ret != _SUCCESS) {
                                pmlmepriv->to_join = false;
-                               RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_err_, ("rtw_do_join(): site survey return error\n."));
+                               RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_err_, ("%s: site survey return error\n.", __func__));
                        }
                } else {
                        pmlmepriv->to_join = false;
        enum ndis_802_11_network_infra *pold_state = &cur_network->network.InfrastructureMode;
 
        RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_notice_,
-                ("+rtw_set_802_11_infrastructure_mode: old =%d new =%d fw_state = 0x%08x\n",
+                ("+%s: old =%d new =%d fw_state = 0x%08x\n", __func__,
                  *pold_state, networktype, get_fwstate(pmlmepriv)));
 
        if (*pold_state != networktype) {
                break;
        }
        RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_info_,
-                ("rtw_set_802_11_add_wep:before memcpy, wep->KeyLength = 0x%x wep->KeyIndex = 0x%x  keyid =%x\n",
+                ("%s:before memcpy, wep->KeyLength = 0x%x wep->KeyIndex = 0x%x  keyid =%x\n", __func__,
                 wep->KeyLength, wep->KeyIndex, keyid));
 
        memcpy(&psecuritypriv->dot11DefKey[keyid].skey[0],
        psecuritypriv->dot11PrivacyKeyIndex = keyid;
 
        RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_info_,
-                ("rtw_set_802_11_add_wep:security key material : %x %x %x %x %x %x %x %x %x %x %x %x %x\n",
+                ("%s:security key material : %x %x %x %x %x %x %x %x %x %x %x %x %x\n", __func__,
                 psecuritypriv->dot11DefKey[keyid].skey[0],
                 psecuritypriv->dot11DefKey[keyid].skey[1],
                 psecuritypriv->dot11DefKey[keyid].skey[2],