Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

staging: rtl8723au: Update RT_TRACE macro and uses

Create an rt_trace function using %pV to reduce overall code size.
Update the macro uses to remove unnecessary and now harmful parentheses.

Miscellanea around these changes:

o Coalesce formats
o Realign arguments
o Remove commented-out RT_TRACE uses
o Spelling fixes in formats
o Add missing newlines to formats
o Remove multiple newlines from formats
o Neaten formats where noticed
o Use %pM in one instance

Reduces code size ~20KB

Signed-off-by: Joe Perches <joe@perches.com>
Acked-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

authored by

Joe Perches and committed by
Greg Kroah-Hartman
90403aa1 73454eaf

+660 -821
+23 -32
drivers/staging/rtl8723au/core/rtw_cmd.c
··· 299 299 pcmd_callback = rtw_cmd_callback[pcmd->cmdcode].callback; 300 300 if (!pcmd_callback) { 301 301 RT_TRACE(_module_rtl871x_cmd_c_, _drv_info_, 302 - ("mlme_cmd_hdl(): pcmd_callback = 0x%p, " 303 - "cmdcode = 0x%x\n", 304 - pcmd_callback, pcmd->cmdcode)); 302 + "mlme_cmd_hdl(): pcmd_callback = 0x%p, cmdcode = 0x%x\n", 303 + pcmd_callback, pcmd->cmdcode); 305 304 rtw_free_cmd_obj23a(pcmd); 306 305 } else { 307 306 /* need consider that free cmd_obj in ··· 309 310 } 310 311 } else { 311 312 RT_TRACE(_module_rtl871x_cmd_c_, _drv_err_, 312 - ("%s: cmdcode = 0x%x callback not defined!\n", 313 - __func__, pcmd->cmdcode)); 313 + "%s: cmdcode = 0x%x callback not defined!\n", 314 + __func__, pcmd->cmdcode); 314 315 rtw_free_cmd_obj23a(pcmd); 315 316 } 316 317 } ··· 342 343 rtw_free_network_queue23a(padapter); 343 344 344 345 RT_TRACE(_module_rtl871x_cmd_c_, _drv_info_, 345 - ("%s: flush network queue\n", __func__)); 346 + "%s: flush network queue\n", __func__); 346 347 347 348 init_h2fwcmd_w_parm_no_rsp(ph2c, psurveyPara, 348 349 GEN_CMD_CODE(_SiteSurvey)); ··· 411 412 412 413 if (pmlmepriv->assoc_ssid.ssid_len == 0) { 413 414 RT_TRACE(_module_rtl871x_cmd_c_, _drv_info_, 414 - (" createbss for Any SSid:%s\n", 415 - pmlmepriv->assoc_ssid.ssid)); 415 + "createbss for Any SSid:%s\n", 416 + pmlmepriv->assoc_ssid.ssid); 416 417 } else { 417 418 RT_TRACE(_module_rtl871x_cmd_c_, _drv_info_, 418 - (" createbss for SSid:%s\n", 419 - pmlmepriv->assoc_ssid.ssid)); 419 + "createbss for SSid:%s\n", 420 + pmlmepriv->assoc_ssid.ssid); 420 421 } 421 422 422 423 pcmd = kzalloc(sizeof(struct cmd_obj), GFP_ATOMIC); ··· 459 460 460 461 if (pmlmepriv->assoc_ssid.ssid_len == 0) { 461 462 RT_TRACE(_module_rtl871x_cmd_c_, _drv_info_, 462 - ("+Join cmd: Any SSid\n")); 463 + "+Join cmd: Any SSid\n"); 463 464 } else { 464 465 RT_TRACE(_module_rtl871x_cmd_c_, _drv_notice_, 465 - ("+Join cmd: SSid =[%s]\n", 466 - pmlmepriv->assoc_ssid.ssid)); 466 + "+Join cmd: SSid =[%s]\n", 467 + pmlmepriv->assoc_ssid.ssid); 467 468 } 468 469 469 470 pcmd = kzalloc(sizeof(struct cmd_obj), GFP_ATOMIC); 470 471 if (!pcmd) { 471 472 res = _FAIL; 472 473 RT_TRACE(_module_rtl871x_cmd_c_, _drv_err_, 473 - ("rtw_joinbss_cmd23a: memory allocate for cmd_obj " 474 - "fail!!!\n")); 474 + "rtw_joinbss_cmd23a: memory allocate for cmd_obj fail!!!\n"); 475 475 goto exit; 476 476 } 477 477 ··· 495 497 res = _FAIL; 496 498 497 499 RT_TRACE(_module_rtl871x_cmd_c_, _drv_err_, 498 - ("rtw_joinbss_cmd23a :psecnetwork == NULL!!!\n")); 500 + "rtw_joinbss_cmd23a :psecnetwork == NULL!!!\n"); 499 501 500 502 goto exit; 501 503 } ··· 597 599 int res = _SUCCESS; 598 600 599 601 RT_TRACE(_module_rtl871x_cmd_c_, _drv_notice_, 600 - ("+rtw_disassoc_cmd23a\n")); 602 + "+rtw_disassoc_cmd23a\n"); 601 603 602 604 /* prepare cmd parameter */ 603 605 param = kzalloc(sizeof(*param), GFP_ATOMIC); ··· 1289 1291 mod_timer(&pmlmepriv->scan_to_timer, 1290 1292 jiffies + msecs_to_jiffies(1)); 1291 1293 RT_TRACE(_module_rtl871x_cmd_c_, _drv_err_, 1292 - ("\n ********Error: MgntActrtw_set_802_11_bssid23a_" 1293 - "LIST_SCAN Fail ************\n\n.")); 1294 + "********Error: MgntActrtw_set_802_11_bssid23a_LIST_SCAN Fail ************\n"); 1294 1295 } 1295 1296 1296 1297 /* free cmd */ ··· 1306 1309 set_fwstate(pmlmepriv, _FW_LINKED); 1307 1310 spin_unlock_bh(&pmlmepriv->lock); 1308 1311 RT_TRACE(_module_rtl871x_cmd_c_, _drv_err_, 1309 - ("\n ***Error: disconnect_cmd_callback Fail ***\n.")); 1312 + "***Error: disconnect_cmd_callback Fail ***\n"); 1310 1313 return; 1311 1314 } 1312 1315 ··· 1326 1329 jiffies + msecs_to_jiffies(1)); 1327 1330 } else if (pcmd->res != H2C_SUCCESS) { 1328 1331 RT_TRACE(_module_rtl871x_cmd_c_, _drv_err_, 1329 - ("********Error:rtw_select_and_join_from_scanned_" 1330 - "queue Wait Sema Fail ************\n")); 1332 + "********Error:rtw_select_and_join_from_scanned_queue Wait Sema Fail ************\n"); 1331 1333 mod_timer(&pmlmepriv->assoc_timer, 1332 1334 jiffies + msecs_to_jiffies(1)); 1333 1335 } ··· 1345 1349 1346 1350 if (pcmd->res != H2C_SUCCESS) { 1347 1351 RT_TRACE(_module_rtl871x_cmd_c_, _drv_err_, 1348 - ("\n ********Error: rtw_createbss_cmd23a_callback " 1349 - "Fail ************\n\n.")); 1352 + "********Error: rtw_createbss_cmd23a_callback Fail ************\n"); 1350 1353 mod_timer(&pmlmepriv->assoc_timer, 1351 1354 jiffies + msecs_to_jiffies(1)); 1352 1355 } ··· 1361 1366 GFP_KERNEL); 1362 1367 if (!psta) { 1363 1368 RT_TRACE(_module_rtl871x_cmd_c_, _drv_err_, 1364 - ("\nCan't alloc sta_info when " 1365 - "createbss_cmd_callback\n")); 1369 + "Can't alloc sta_info when createbss_cmd_callback\n"); 1366 1370 goto createbss_cmd_fail; 1367 1371 } 1368 1372 } ··· 1376 1382 pwlan = rtw_get_oldest_wlan_network23a(&pmlmepriv->scanned_queue); 1377 1383 if (!pwlan) { 1378 1384 RT_TRACE(_module_rtl871x_cmd_c_, _drv_err_, 1379 - ("\n Error: can't get pwlan in " 1380 - "rtw23a_joinbss_event_cb\n")); 1385 + "Error: can't get pwlan in rtw23a_joinbss_event_cb\n"); 1381 1386 spin_unlock_bh(&pmlmepriv->scanned_queue.lock); 1382 1387 goto createbss_cmd_fail; 1383 1388 } ··· 1425 1432 1426 1433 if (!psta) { 1427 1434 RT_TRACE(_module_rtl871x_cmd_c_, _drv_err_, 1428 - ("\nERROR: rtw_setstaKey_cmdrsp_callback23a => " 1429 - "can't get sta_info\n\n")); 1435 + "ERROR: rtw_setstaKey_cmdrsp_callback23a => can't get sta_info\n"); 1430 1436 goto exit; 1431 1437 } 1432 1438 ··· 1449 1457 1450 1458 if (psta == NULL) { 1451 1459 RT_TRACE(_module_rtl871x_cmd_c_, _drv_err_, 1452 - ("\nERROR: setassocsta_cmdrsp_callbac => can't " 1453 - "get sta_info\n\n")); 1460 + "ERROR: setassocsta_cmdrsp_callbac => can't get sta_info\n"); 1454 1461 goto exit; 1455 1462 } 1456 1463
-3
drivers/staging/rtl8723au/core/rtw_efuse.c
··· 335 335 u32 k = 0; 336 336 u16 contentLen = 0; 337 337 338 - /* RT_TRACE(COMP_EFUSE, DBG_LOUD, ("Addr =%x Data =%x\n", Address, Value)); */ 339 338 EFUSE_GetEfuseDefinition23a(Adapter, EFUSE_WIFI, 340 339 TYPE_EFUSE_REAL_CONTENT_LEN, 341 340 (void *)&contentLen); ··· 402 403 { 403 404 u8 tmpidx = 0; 404 405 int bResult; 405 - 406 - /* RT_TRACE(COMP_EFUSE, DBG_LOUD, ("Addr = %x Data =%x\n", addr, data)); */ 407 406 408 407 /* return 0; */ 409 408
+30 -34
drivers/staging/rtl8723au/core/rtw_ieee80211.c
··· 472 472 left -= WPA_SELECTOR_LEN; 473 473 } else if (left > 0) { 474 474 RT_TRACE(_module_rtl871x_mlme_c_, _drv_err_, 475 - ("%s: ie length mismatch, %u too much", 476 - __func__, left)); 475 + "%s: ie length mismatch, %u too much\n", 476 + __func__, left); 477 477 478 478 return _FAIL; 479 479 } ··· 487 487 488 488 if (count == 0 || left < count * WPA_SELECTOR_LEN) { 489 489 RT_TRACE(_module_rtl871x_mlme_c_, _drv_err_, 490 - ("%s: ie count botch (pairwise), " 491 - "count %u left %u", __func__, 492 - count, left)); 490 + "%s: ie count botch (pairwise), count %u left %u\n", 491 + __func__, count, left); 493 492 return _FAIL; 494 493 } 495 494 ··· 500 501 } 501 502 } else if (left == 1) { 502 503 RT_TRACE(_module_rtl871x_mlme_c_, _drv_err_, 503 - ("%s: ie too short (for key mgmt)", __func__)); 504 + "%s: ie too short (for key mgmt)\n", __func__); 504 505 return _FAIL; 505 506 } 506 507 ··· 509 510 pos += 2; 510 511 if (!memcmp(pos, RTW_WPA_OUI23A_TYPE, 4)) { 511 512 RT_TRACE(_module_rtl871x_mlme_c_, _drv_info_, 512 - ("%s : there has 802.1x auth\n", 513 - __func__)); 513 + "%s : there has 802.1x auth\n", 514 + __func__); 514 515 *is_8021x = 1; 515 516 } 516 517 } ··· 548 549 left -= RSN_SELECTOR_LEN; 549 550 } else if (left > 0) { 550 551 RT_TRACE(_module_rtl871x_mlme_c_, _drv_err_, 551 - ("%s: ie length mismatch, %u too much", 552 - __func__, left)); 552 + "%s: ie length mismatch, %u too much\n", 553 + __func__, left); 553 554 return _FAIL; 554 555 } 555 556 ··· 562 563 563 564 if (count == 0 || left < count * RSN_SELECTOR_LEN) { 564 565 RT_TRACE(_module_rtl871x_mlme_c_, _drv_err_, 565 - ("%s: ie count botch (pairwise), " 566 - "count %u left %u", 567 - __func__, count, left)); 566 + "%s: ie count botch (pairwise), count %u left %u\n", 567 + __func__, count, left); 568 568 return _FAIL; 569 569 } 570 570 ··· 575 577 } 576 578 } else if (left == 1) { 577 579 RT_TRACE(_module_rtl871x_mlme_c_, _drv_err_, 578 - ("%s: ie too short (for key mgmt)", __func__)); 580 + "%s: ie too short (for key mgmt)\n", __func__); 579 581 580 582 return _FAIL; 581 583 } ··· 585 587 pos += 2; 586 588 if (!memcmp(pos, SUITE_1X, 4)) { 587 589 RT_TRACE(_module_rtl871x_mlme_c_, _drv_info_, 588 - ("%s (): there has 802.1x auth\n", 589 - __func__)); 590 + "%s (): there has 802.1x auth\n", 591 + __func__); 590 592 *is_8021x = 1; 591 593 } 592 594 } ··· 698 700 699 701 if (pbuf && pbuf[1] > 0) { 700 702 RT_TRACE(_module_rtl871x_mlme_c_, _drv_info_, 701 - ("rtw_get_cipher_info: wpa_ielen: %d", pbuf[1])); 703 + "rtw_get_cipher_info: wpa_ielen: %d\n", pbuf[1]); 702 704 r = rtw_parse_wpa_ie23a(pbuf, pbuf[1] + 2, &group_cipher, 703 705 &pairwise_cipher, &is8021x); 704 706 if (r == _SUCCESS) { ··· 706 708 pnetwork->BcnInfo.group_cipher = group_cipher; 707 709 pnetwork->BcnInfo.is_8021x = is8021x; 708 710 RT_TRACE(_module_rtl871x_mlme_c_, _drv_info_, 709 - ("%s: pnetwork->pairwise_cipher: %d, is_" 710 - "8021x is %d", __func__, 711 - pnetwork->BcnInfo.pairwise_cipher, 712 - pnetwork->BcnInfo.is_8021x)); 711 + "%s: pnetwork->pairwise_cipher: %d, is_8021x is %d\n", 712 + __func__, pnetwork->BcnInfo.pairwise_cipher, 713 + pnetwork->BcnInfo.is_8021x); 713 714 ret = _SUCCESS; 714 715 } 715 716 } else { ··· 716 719 717 720 if (pbuf && pbuf[1] > 0) { 718 721 RT_TRACE(_module_rtl871x_mlme_c_, _drv_info_, 719 - ("get RSN IE\n")); 722 + "get RSN IE\n"); 720 723 r = rtw_parse_wpa2_ie23a(pbuf, pbuf[1] + 2, 721 724 &group_cipher, &pairwise_cipher, 722 725 &is8021x); 723 726 if (r == _SUCCESS) { 724 727 RT_TRACE(_module_rtl871x_mlme_c_, _drv_info_, 725 - ("get RSN IE OK!!!\n")); 728 + "get RSN IE OK!!!\n"); 726 729 pnetwork->BcnInfo.pairwise_cipher = 727 730 pairwise_cipher; 728 731 pnetwork->BcnInfo.group_cipher = group_cipher; 729 732 pnetwork->BcnInfo.is_8021x = is8021x; 730 733 RT_TRACE(_module_rtl871x_mlme_c_, _drv_info_, 731 - ("%s: pnetwork->pairwise_cipher: %d," 732 - "pnetwork->group_cipher is %d, " 733 - "is_8021x is %d", __func__, 734 - pnetwork->BcnInfo.pairwise_cipher, 735 - pnetwork->BcnInfo.group_cipher, 736 - pnetwork->BcnInfo.is_8021x)); 734 + "%s: pnetwork->pairwise_cipher: %d,pnetwork->group_cipher is %d, is_8021x is %d\n", 735 + __func__, 736 + pnetwork->BcnInfo.pairwise_cipher, 737 + pnetwork->BcnInfo.group_cipher, 738 + pnetwork->BcnInfo.is_8021x); 737 739 ret = _SUCCESS; 738 740 } 739 741 } ··· 755 759 pnetwork->BcnInfo.encryp_protocol = ENCRYP_PROTOCOL_OPENSYS; 756 760 757 761 RT_TRACE(_module_rtl871x_mlme_c_, _drv_info_, 758 - ("%s: ssid =%s\n", __func__, pnetwork->network.Ssid.ssid)); 762 + "%s: ssid =%s\n", __func__, pnetwork->network.Ssid.ssid); 759 763 760 764 pie = pnetwork->network.IEs; 761 765 pie_len = pnetwork->network.IELength; ··· 772 776 pnetwork->BcnInfo.encryp_protocol = ENCRYP_PROTOCOL_WEP; 773 777 } 774 778 RT_TRACE(_module_rtl871x_mlme_c_, _drv_info_, 775 - ("%s: pnetwork->encryp_protocol is %x\n", __func__, 776 - pnetwork->BcnInfo.encryp_protocol)); 779 + "%s: pnetwork->encryp_protocol is %x\n", __func__, 780 + pnetwork->BcnInfo.encryp_protocol); 777 781 RT_TRACE(_module_rtl871x_mlme_c_, _drv_info_, 778 - ("%s: pnetwork->encryp_protocol is %x\n", __func__, 779 - pnetwork->BcnInfo.encryp_protocol)); 782 + "%s: pnetwork->encryp_protocol is %x\n", __func__, 783 + pnetwork->BcnInfo.encryp_protocol); 780 784 rtw_get_cipher_info(pnetwork); 781 785 782 786 /* get bwmode and ch_offset */
+60 -72
drivers/staging/rtl8723au/core/rtw_mlme.c
··· 94 94 void rtw_free_mlme_priv23a(struct mlme_priv *pmlmepriv) 95 95 { 96 96 RT_TRACE(_module_rtl871x_mlme_c_, _drv_err_, 97 - ("rtw_free_mlme_priv23a\n")); 97 + "rtw_free_mlme_priv23a\n"); 98 98 99 99 rtw23a_free_mlme_priv_ie_data(pmlmepriv); 100 100 } ··· 196 196 if (padapter->bDriverStopped || padapter->bSurpriseRemoved || 197 197 !check_fwstate(&padapter->mlmepriv, _FW_LINKED)) { 198 198 RT_TRACE(_module_rtl871x_mlme_c_, _drv_info_, 199 - ("rtw_if_up23a:bDriverStopped(%d) OR " 200 - "bSurpriseRemoved(%d)", padapter->bDriverStopped, 201 - padapter->bSurpriseRemoved)); 199 + "rtw_if_up23a:bDriverStopped(%d) OR bSurpriseRemoved(%d)\n", 200 + padapter->bDriverStopped, padapter->bSurpriseRemoved); 202 201 res = false; 203 202 } else 204 203 res = true; ··· 465 466 if (!pnetwork) { 466 467 if (!oldest) { 467 468 RT_TRACE(_module_rtl871x_mlme_c_, _drv_err_, 468 - ("\n\n\nsomething wrong here\n\n\n")); 469 + "something wrong here\n"); 469 470 goto exit; 470 471 } 471 472 pnetwork = oldest; ··· 577 578 pnetwork = survey->bss; 578 579 579 580 RT_TRACE(_module_rtl871x_mlme_c_, _drv_info_, 580 - ("rtw_survey_event_cb23a, ssid=%s\n", pnetwork->Ssid.ssid)); 581 + "rtw_survey_event_cb23a, ssid=%s\n", pnetwork->Ssid.ssid); 581 582 582 583 len = get_wlan_bssid_ex_sz(pnetwork); 583 584 if (len > (sizeof(struct wlan_bssid_ex))) { 584 585 RT_TRACE(_module_rtl871x_mlme_c_, _drv_err_, 585 - ("\n ****rtw_survey_event_cb23a: return a wrong " 586 - "bss ***\n")); 586 + "****rtw_survey_event_cb23a: return a wrong bss ***\n"); 587 587 return; 588 588 } 589 589 ··· 590 592 591 593 /* update IBSS_network 's timestamp */ 592 594 if (check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE)) { 593 - /* RT_TRACE(_module_rtl871x_mlme_c_, _drv_err_, 594 - "rtw_survey_event_cb23a : WIFI_ADHOC_MASTER_STATE\n\n"); */ 595 595 if (ether_addr_equal(pmlmepriv->cur_network.network.MacAddress, 596 596 pnetwork->MacAddress)) { 597 597 struct wlan_network *ibss_wlan; ··· 649 653 } 650 654 651 655 RT_TRACE(_module_rtl871x_mlme_c_, _drv_info_, 652 - ("rtw_surveydone_event_callback23a: fw_state:%x\n\n", 653 - get_fwstate(pmlmepriv))); 656 + "rtw_surveydone_event_callback23a: fw_state:%x\n", 657 + get_fwstate(pmlmepriv)); 654 658 655 659 if (check_fwstate(pmlmepriv, _FW_UNDER_SURVEY)) { 656 660 del_timer_sync(&pmlmepriv->scan_to_timer); ··· 658 662 _clr_fwstate_(pmlmepriv, _FW_UNDER_SURVEY); 659 663 } else { 660 664 RT_TRACE(_module_rtl871x_mlme_c_, _drv_err_, 661 - ("nic status =%x, survey done event comes too late!\n", 662 - get_fwstate(pmlmepriv))); 665 + "nic status =%x, survey done event comes too late!\n", 666 + get_fwstate(pmlmepriv)); 663 667 } 664 668 665 669 rtw_set_signal_stat_timer(&adapter->recvpriv); ··· 714 718 struct rtw_queue *scan_queue = &pmlmepriv->scanned_queue; 715 719 struct list_head *plist, *phead, *ptemp; 716 720 717 - RT_TRACE(_module_rtl871x_mlme_c_, _drv_notice_, ("+free_scanqueue\n")); 721 + RT_TRACE(_module_rtl871x_mlme_c_, _drv_notice_, "+free_scanqueue\n"); 718 722 spin_lock_bh(&scan_queue->lock); 719 723 720 724 phead = get_list_head(scan_queue); ··· 741 745 struct sta_info *psta; 742 746 743 747 RT_TRACE(_module_rtl871x_mlme_c_, _drv_notice_, 744 - ("+rtw_free_assoc_resources23a\n")); 748 + "+rtw_free_assoc_resources23a\n"); 745 749 RT_TRACE(_module_rtl871x_mlme_c_, _drv_info_, 746 - ("tgt_network->network.MacAddress=%pM ssid=%s\n", 747 - tgt_network->network.MacAddress, 748 - tgt_network->network.Ssid.ssid)); 750 + "tgt_network->network.MacAddress=%pM ssid=%s\n", 751 + tgt_network->network.MacAddress, 752 + tgt_network->network.Ssid.ssid); 749 753 750 754 if (check_fwstate(pmlmepriv, WIFI_STATION_STATE|WIFI_AP_STATE)) { 751 755 psta = rtw_get_stainfo23a(&adapter->stapriv, ··· 777 781 pwlan->fixed = false; 778 782 else 779 783 RT_TRACE(_module_rtl871x_mlme_c_, _drv_err_, 780 - ("rtw_free_assoc_resources23a : pwlan== NULL\n")); 784 + "rtw_free_assoc_resources23a : pwlan== NULL\n"); 781 785 782 786 if (check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE) && 783 787 adapter->stapriv.asoc_sta_count == 1) ··· 797 801 struct mlme_priv *pmlmepriv = &padapter->mlmepriv; 798 802 799 803 RT_TRACE(_module_rtl871x_mlme_c_, _drv_err_, 800 - ("+rtw_indicate_connect23a\n")); 804 + "+rtw_indicate_connect23a\n"); 801 805 802 806 pmlmepriv->to_join = false; 803 807 ··· 817 821 rtw_set_scan_deny(padapter, 3000); 818 822 819 823 RT_TRACE(_module_rtl871x_mlme_c_, _drv_err_, 820 - ("-rtw_indicate_connect23a: fw_state=0x%08x\n", 821 - get_fwstate(pmlmepriv))); 824 + "-rtw_indicate_connect23a: fw_state=0x%08x\n", 825 + get_fwstate(pmlmepriv)); 822 826 } 823 827 824 828 /* ··· 829 833 struct mlme_priv *pmlmepriv = &padapter->mlmepriv; 830 834 831 835 RT_TRACE(_module_rtl871x_mlme_c_, _drv_err_, 832 - ("+rtw_indicate_disconnect23a\n")); 836 + "+rtw_indicate_disconnect23a\n"); 833 837 834 838 _clr_fwstate_(pmlmepriv, _FW_UNDER_LINKING|WIFI_UNDER_WPS); 835 839 ··· 987 991 DBG_8723A("%s\n", __func__); 988 992 989 993 RT_TRACE(_module_rtl871x_mlme_c_, _drv_info_, 990 - ("\nfw_state:%x, BSSID:%pM\n", 991 - get_fwstate(pmlmepriv), 992 - pnetwork->network.MacAddress)); 994 + "fw_state:%x, BSSID:%pM\n", 995 + get_fwstate(pmlmepriv), 996 + pnetwork->network.MacAddress); 993 997 994 998 /* why not use ptarget_wlan?? */ 995 999 memcpy(&cur_network->network, &pnetwork->network, ··· 1032 1036 default: 1033 1037 pmlmepriv->fw_state = WIFI_NULL_STATE; 1034 1038 RT_TRACE(_module_rtl871x_mlme_c_, _drv_err_, 1035 - ("Invalid network_mode\n")); 1039 + "Invalid network_mode\n"); 1036 1040 break; 1037 1041 } 1038 1042 ··· 1067 1071 bool the_same_macaddr; 1068 1072 1069 1073 RT_TRACE(_module_rtl871x_mlme_c_, _drv_info_, 1070 - ("joinbss event call back received with res=%d\n", 1071 - pnetwork->join_res)); 1074 + "joinbss event call back received with res=%d\n", 1075 + pnetwork->join_res); 1072 1076 1073 1077 if (pmlmepriv->assoc_ssid.ssid_len == 0) { 1074 1078 RT_TRACE(_module_rtl871x_mlme_c_, _drv_err_, 1075 - ("@@@@@ joinbss event call back for Any SSid\n")); 1079 + "@@@@@ joinbss event call back for Any SSid\n"); 1076 1080 } else { 1077 1081 RT_TRACE(_module_rtl871x_mlme_c_, _drv_err_, 1078 - ("@@@@@ rtw23a_joinbss_event_cb for SSid:%s\n", 1079 - pmlmepriv->assoc_ssid.ssid)); 1082 + "@@@@@ rtw23a_joinbss_event_cb for SSid:%s\n", 1083 + pmlmepriv->assoc_ssid.ssid); 1080 1084 } 1081 1085 1082 1086 if (ether_addr_equal(pnetwork->network.MacAddress, ··· 1088 1092 pnetwork->network.Length = get_wlan_bssid_ex_sz(&pnetwork->network); 1089 1093 if (pnetwork->network.Length > sizeof(struct wlan_bssid_ex)) { 1090 1094 RT_TRACE(_module_rtl871x_mlme_c_, _drv_err_, 1091 - ("\n\n ***joinbss_evt_callback return a wrong bss " 1092 - "***\n\n")); 1095 + "***joinbss_evt_callback return a wrong bss ***\n"); 1093 1096 return; 1094 1097 } 1095 1098 1096 1099 spin_lock_bh(&pmlmepriv->lock); 1097 1100 1098 1101 RT_TRACE(_module_rtl871x_mlme_c_, _drv_info_, 1099 - ("\n rtw23a_joinbss_event_cb !! _enter_critical\n")); 1102 + "rtw23a_joinbss_event_cb !! _enter_critical\n"); 1100 1103 1101 1104 if (pnetwork->join_res > 0) { 1102 1105 spin_lock_bh(&pmlmepriv->scanned_queue.lock); ··· 1144 1149 pnetwork); 1145 1150 else { 1146 1151 RT_TRACE(_module_rtl871x_mlme_c_, _drv_err_, 1147 - ("Can't find ptarget_wlan when " 1148 - "joinbss_event callback\n")); 1152 + "Can't find ptarget_wlan when joinbss_event callback\n"); 1149 1153 spin_unlock_bh(&pmlmepriv->scanned_queue.lock); 1150 1154 goto ignore_joinbss_callback; 1151 1155 } ··· 1157 1163 if (!ptarget_sta) { 1158 1164 RT_TRACE(_module_rtl871x_mlme_c_, 1159 1165 _drv_err_, 1160 - ("Can't update stainfo when " 1161 - "joinbss_event callback\n")); 1166 + "Can't update stainfo when joinbss_event callback\n"); 1162 1167 spin_unlock_bh(&pmlmepriv->scanned_queue.lock); 1163 1168 goto ignore_joinbss_callback; 1164 1169 } ··· 1170 1177 /* adhoc mode will rtw_indicate_connect23a 1171 1178 when rtw_stassoc_event_callback23a */ 1172 1179 RT_TRACE(_module_rtl871x_mlme_c_, _drv_info_, 1173 - ("adhoc mode, fw_state:%x", 1174 - get_fwstate(pmlmepriv))); 1180 + "adhoc mode, fw_state:%x\n", 1181 + get_fwstate(pmlmepriv)); 1175 1182 } 1176 1183 1177 1184 /* s5. Cancle assoc_timer */ 1178 1185 del_timer_sync(&pmlmepriv->assoc_timer); 1179 1186 1180 1187 RT_TRACE(_module_rtl871x_mlme_c_, _drv_info_, 1181 - ("Cancle assoc_timer\n")); 1188 + "Cancle assoc_timer\n"); 1182 1189 } else { 1183 1190 RT_TRACE(_module_rtl871x_mlme_c_, _drv_err_, 1184 - ("rtw23a_joinbss_event_cb err: fw_state:%x", 1185 - get_fwstate(pmlmepriv))); 1191 + "rtw23a_joinbss_event_cb err: fw_state:%x\n", 1192 + get_fwstate(pmlmepriv)); 1186 1193 spin_unlock_bh(&pmlmepriv->scanned_queue.lock); 1187 1194 goto ignore_joinbss_callback; 1188 1195 } ··· 1196 1203 1197 1204 if (check_fwstate(pmlmepriv, _FW_UNDER_LINKING)) { 1198 1205 RT_TRACE(_module_rtl871x_mlme_c_, _drv_err_, 1199 - ("fail! clear _FW_UNDER_LINKING ^^^fw_state=" 1200 - "%x\n", get_fwstate(pmlmepriv))); 1206 + "fail! clear _FW_UNDER_LINKING ^^^fw_state=%x\n", 1207 + get_fwstate(pmlmepriv)); 1201 1208 _clr_fwstate_(pmlmepriv, _FW_UNDER_LINKING); 1202 1209 } 1203 1210 } else { ··· 1248 1255 if (psta != NULL) { 1249 1256 /* the sta have been in sta_info_queue => do nothing */ 1250 1257 RT_TRACE(_module_rtl871x_mlme_c_, _drv_err_, 1251 - ("Error: rtw_stassoc_event_callback23a: sta has " 1252 - "been in sta_hash_queue\n")); 1258 + "Error: rtw_stassoc_event_callback23a: sta has been in sta_hash_queue\n"); 1253 1259 /* between drv has received this event before and 1254 1260 fw have not yet to set key to CAM_ENTRY) */ 1255 1261 return; ··· 1258 1266 GFP_KERNEL); 1259 1267 if (!psta) { 1260 1268 RT_TRACE(_module_rtl871x_mlme_c_, _drv_err_, 1261 - ("Can't alloc sta_info when " 1262 - "rtw_stassoc_event_callback23a\n")); 1269 + "Can't alloc sta_info when rtw_stassoc_event_callback23a\n"); 1263 1270 return; 1264 1271 } 1265 1272 ··· 1636 1645 pnetwork = container_of(plist, struct wlan_network, list); 1637 1646 if (!pnetwork) { 1638 1647 RT_TRACE(_module_rtl871x_mlme_c_, _drv_err_, 1639 - ("%s: return _FAIL:(pnetwork == NULL)\n", 1640 - __func__)); 1648 + "%s: return _FAIL:(pnetwork == NULL)\n", 1649 + __func__); 1641 1650 goto exit; 1642 1651 } 1643 1652 ··· 1663 1672 _clr_fwstate_(pmlmepriv, _FW_UNDER_SURVEY); 1664 1673 1665 1674 RT_TRACE(_module_rtl871x_mlme_c_, _drv_err_, 1666 - ("switching to adhoc master\n")); 1675 + "switching to adhoc master\n"); 1667 1676 1668 1677 memcpy(&pdev_network->Ssid, &pmlmepriv->assoc_ssid, 1669 1678 sizeof(struct cfg80211_ssid)); ··· 1676 1685 ret = rtw_createbss_cmd23a(adapter); 1677 1686 if (ret != _SUCCESS) { 1678 1687 RT_TRACE(_module_rtl871x_mlme_c_, _drv_err_, 1679 - ("Error =>rtw_createbss_cmd23a status FAIL\n")); 1688 + "Error =>rtw_createbss_cmd23a status FAIL\n"); 1680 1689 } else { 1681 1690 pmlmepriv->to_join = false; 1682 1691 } ··· 1765 1774 pcmd->rspsz = 0; 1766 1775 1767 1776 RT_TRACE(_module_rtl871x_mlme_c_, _drv_err_, 1768 - ("after enqueue set_auth_cmd, auth_mode=%x\n", 1769 - psecuritypriv->dot11AuthAlgrthm)); 1777 + "after enqueue set_auth_cmd, auth_mode=%x\n", 1778 + psecuritypriv->dot11AuthAlgrthm); 1770 1779 1771 1780 res = rtw_enqueue_cmd23a(pcmdpriv, pcmd); 1772 1781 ··· 1806 1815 psetkeyparm->algorithm = (unsigned char) 1807 1816 psecuritypriv->dot118021XGrpPrivacy; 1808 1817 RT_TRACE(_module_rtl871x_mlme_c_, _drv_err_, 1809 - ("\n rtw_set_key23a: psetkeyparm->algorithm = " 1810 - "(unsigned char)psecuritypriv->dot118021XGrpPrivacy " 1811 - "=%d\n", psetkeyparm->algorithm)); 1818 + "rtw_set_key23a: psetkeyparm->algorithm = (unsigned char)psecuritypriv->dot118021XGrpPrivacy =%d\n", 1819 + psetkeyparm->algorithm); 1812 1820 } else { 1813 1821 psetkeyparm->algorithm = (u8)psecuritypriv->dot11PrivacyAlgrthm; 1814 1822 RT_TRACE(_module_rtl871x_mlme_c_, _drv_err_, 1815 - ("\n rtw_set_key23a: psetkeyparm->algorithm = (u8)" 1816 - "psecuritypriv->dot11PrivacyAlgrthm =%d\n", 1817 - psetkeyparm->algorithm)); 1823 + "rtw_set_key23a: psetkeyparm->algorithm = (u8)psecuritypriv->dot11PrivacyAlgrthm =%d\n", 1824 + psetkeyparm->algorithm); 1818 1825 } 1819 1826 psetkeyparm->keyid = keyid;/* 0~3 */ 1820 1827 psetkeyparm->set_tx = set_tx; ··· 1823 1834 psetkeyparm->algorithm, psetkeyparm->keyid, 1824 1835 pmlmepriv->key_mask); 1825 1836 RT_TRACE(_module_rtl871x_mlme_c_, _drv_err_, 1826 - ("\n rtw_set_key23a: psetkeyparm->algorithm =%d psetkeyparm->" 1827 - "keyid = (u8)keyid =%d\n", psetkeyparm->algorithm, keyid)); 1837 + "rtw_set_key23a: psetkeyparm->algorithm =%d psetkeyparm->keyid = (u8)keyid =%d\n", 1838 + psetkeyparm->algorithm, keyid); 1828 1839 1829 1840 switch (psetkeyparm->algorithm) { 1830 1841 case WLAN_CIPHER_SUITE_WEP40: ··· 1851 1862 break; 1852 1863 default: 1853 1864 RT_TRACE(_module_rtl871x_mlme_c_, _drv_err_, 1854 - ("\n rtw_set_key23a:psecuritypriv->dot11PrivacyAlgrthm" 1855 - " = %x (must be 1 or 2 or 4 or 5)\n", 1856 - psecuritypriv->dot11PrivacyAlgrthm)); 1865 + "rtw_set_key23a:psecuritypriv->dot11PrivacyAlgrthm = %x (must be 1 or 2 or 4 or 5)\n", 1866 + psecuritypriv->dot11PrivacyAlgrthm); 1857 1867 res = _FAIL; 1858 1868 kfree(pcmd); 1859 1869 kfree(psetkeyparm); ··· 1979 1991 uint ndissecuritytype = psecuritypriv->ndisencryptstatus; 1980 1992 1981 1993 RT_TRACE(_module_rtl871x_mlme_c_, _drv_notice_, 1982 - ("+rtw_restruct_sec_ie23a: ndisauthmode=%d " 1983 - "ndissecuritytype=%d\n", ndisauthmode, ndissecuritytype)); 1994 + "+rtw_restruct_sec_ie23a: ndisauthmode=%d ndissecuritytype=%d\n", 1995 + ndisauthmode, ndissecuritytype); 1984 1996 1985 1997 ielength = 0; 1986 1998 if (ndisauthmode == Ndis802_11AuthModeWPA || ··· 2046 2058 2047 2059 pdev_network->DSConfig = pregistrypriv->channel; 2048 2060 RT_TRACE(_module_rtl871x_mlme_c_, _drv_info_, 2049 - ("pregistrypriv->channel =%d, pdev_network->DSConfig = 0x%x\n", 2050 - pregistrypriv->channel, pdev_network->DSConfig)); 2061 + "pregistrypriv->channel =%d, pdev_network->DSConfig = 0x%x\n", 2062 + pregistrypriv->channel, pdev_network->DSConfig); 2051 2063 2052 2064 if (cur_network->network.ifmode == NL80211_IFTYPE_ADHOC) 2053 2065 pdev_network->ATIMWindow = 0;
+12 -12
drivers/staging/rtl8723au/core/rtw_mlme_ext.c
··· 657 657 658 658 if (index > 13) { 659 659 RT_TRACE(_module_rtl871x_mlme_c_, _drv_err_, 660 - ("Currently we do not support reserved sub-fr-type =" 661 - "%d\n", index)); 660 + "Currently we do not support reserved sub-fr-type =%d\n", 661 + index); 662 662 return; 663 663 } 664 664 ptable += index; ··· 2685 2685 u8 bc_addr[] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff}; 2686 2686 2687 2687 RT_TRACE(_module_rtl871x_mlme_c_, _drv_notice_, 2688 - ("+%s\n", __func__)); 2688 + "+%s\n", __func__); 2689 2689 2690 2690 pmgntframe = alloc_mgtxmitframe23a(pxmitpriv); 2691 2691 if (!pmgntframe) ··· 2756 2756 pattrib->last_txcmdsz = pattrib->pktlen; 2757 2757 2758 2758 RT_TRACE(_module_rtl871x_mlme_c_, _drv_notice_, 2759 - ("issuing probe_req, tx_len =%d\n", pattrib->last_txcmdsz)); 2759 + "issuing probe_req, tx_len =%d\n", pattrib->last_txcmdsz); 2760 2760 2761 2761 if (wait_ack) { 2762 2762 ret = dump_mgntframe23a_and_wait_ack23a(padapter, pmgntframe); ··· 4338 4338 4339 4339 /* issue beacon */ 4340 4340 if (send_beacon23a(padapter) == _FAIL) { 4341 - RT_TRACE(_module_rtl871x_mlme_c_, _drv_err_, ("issuing beacon frame fail....\n")); 4341 + RT_TRACE(_module_rtl871x_mlme_c_, _drv_err_, 4342 + "issuing beacon frame fail....\n"); 4342 4343 4343 4344 report_join_res23a(padapter, -1); 4344 4345 pmlmeinfo->state = MSR_NOLINK; ··· 4523 4522 4524 4523 p += 3; 4525 4524 RT_TRACE(_module_rtl871x_mlme_c_, _drv_notice_, 4526 - ("%s: 802.11d country =%s\n", __func__, country)); 4525 + "%s: 802.11d country =%s\n", __func__, country); 4527 4526 4528 4527 i = 0; 4529 4528 while ((ie - p) >= 3) { ··· 4700 4699 4701 4700 chplan_new[i].ScanType = SCAN_ACTIVE; 4702 4701 RT_TRACE(_module_rtl871x_mlme_c_, _drv_notice_, 4703 - ("%s: change channel %d scan type " 4704 - "from passive to active\n", 4705 - __func__, channel)); 4702 + "%s: change channel %d scan type from passive to active\n", 4703 + __func__, channel); 4706 4704 } 4707 4705 break; 4708 4706 } ··· 6057 6057 /* checking if event code is valid */ 6058 6058 if (evt_code >= MAX_C2HEVT) { 6059 6059 RT_TRACE(_module_rtl871x_cmd_c_, _drv_err_, 6060 - ("\nEvent Code(%d) mismatch!\n", evt_code)); 6060 + "Event Code(%d) mismatch!\n", evt_code); 6061 6061 goto _abort_event_; 6062 6062 } 6063 6063 ··· 6065 6065 if (wlanevents[evt_code].parmsize != 0 && 6066 6066 wlanevents[evt_code].parmsize != evt_sz) { 6067 6067 RT_TRACE(_module_rtl871x_cmd_c_, _drv_err_, 6068 - ("\nEvent(%d) Parm Size mismatch (%d vs %d)!\n", 6069 - evt_code, wlanevents[evt_code].parmsize, evt_sz)); 6068 + "Event(%d) Parm Size mismatch (%d vs %d)!\n", 6069 + evt_code, wlanevents[evt_code].parmsize, evt_sz); 6070 6070 goto _abort_event_; 6071 6071 } 6072 6072
+14 -15
drivers/staging/rtl8723au/core/rtw_pwrctrl.c
··· 202 202 203 203 if (pwrpriv->rpwm == pslv) { 204 204 RT_TRACE(_module_rtl871x_pwrctrl_c_, _drv_err_, 205 - ("%s: Already set rpwm[0x%02X], new = 0x%02X!\n", 206 - __func__, pwrpriv->rpwm, pslv)); 205 + "%s: Already set rpwm[0x%02X], new = 0x%02X!\n", 206 + __func__, pwrpriv->rpwm, pslv); 207 207 return; 208 208 } 209 209 210 210 if (padapter->bSurpriseRemoved == true || 211 211 padapter->hw_init_completed == false) { 212 212 RT_TRACE(_module_rtl871x_pwrctrl_c_, _drv_err_, 213 - ("%s: SurpriseRemoved(%d) hw_init_completed(%d)\n", 214 - __func__, padapter->bSurpriseRemoved, 215 - padapter->hw_init_completed)); 213 + "%s: SurpriseRemoved(%d) hw_init_completed(%d)\n", 214 + __func__, padapter->bSurpriseRemoved, 215 + padapter->hw_init_completed); 216 216 217 217 pwrpriv->cpwm = PS_STATE_S4; 218 218 ··· 221 221 222 222 if (padapter->bDriverStopped == true) { 223 223 RT_TRACE(_module_rtl871x_pwrctrl_c_, _drv_err_, 224 - ("%s: change power state(0x%02X) when DriverStopped\n", 225 - __func__, pslv)); 224 + "%s: change power state(0x%02X) when DriverStopped\n", 225 + __func__, pslv); 226 226 227 227 if (pslv < PS_STATE_S2) { 228 228 RT_TRACE(_module_rtl871x_pwrctrl_c_, _drv_err_, 229 - ("%s: Reject to enter PS_STATE(0x%02X) lower " 230 - "than S2 when DriverStopped!!\n", 231 - __func__, pslv)); 229 + "%s: Reject to enter PS_STATE(0x%02X) lower than S2 when DriverStopped!!\n", 230 + __func__, pslv); 232 231 return; 233 232 } 234 233 } 235 234 236 235 rpwm = pslv | pwrpriv->tog; 237 236 RT_TRACE(_module_rtl871x_pwrctrl_c_, _drv_notice_, 238 - ("rtw_set_rpwm23a: rpwm = 0x%02x cpwm = 0x%02x\n", 239 - rpwm, pwrpriv->cpwm)); 237 + "rtw_set_rpwm23a: rpwm = 0x%02x cpwm = 0x%02x\n", 238 + rpwm, pwrpriv->cpwm); 240 239 241 240 pwrpriv->rpwm = pslv; 242 241 ··· 281 282 struct pwrctrl_priv *pwrpriv = &padapter->pwrctrlpriv; 282 283 283 284 RT_TRACE(_module_rtl871x_pwrctrl_c_, _drv_notice_, 284 - ("%s: PowerMode =%d Smart_PS =%d\n", 285 - __func__, ps_mode, smart_ps)); 285 + "%s: PowerMode =%d Smart_PS =%d\n", 286 + __func__, ps_mode, smart_ps); 286 287 287 288 if (ps_mode > PM_Card_Disable) { 288 289 RT_TRACE(_module_rtl871x_pwrctrl_c_, _drv_err_, 289 - ("ps_mode:%d error\n", ps_mode)); 290 + "ps_mode:%d error\n", ps_mode); 290 291 return; 291 292 } 292 293
+112 -132
drivers/staging/rtl8723au/core/rtw_recv.c
··· 299 299 300 300 if (prxattrib->encrypt == WLAN_CIPHER_SUITE_TKIP) { 301 301 RT_TRACE(_module_rtl871x_recv_c_, _drv_info_, 302 - ("\n recvframe_chkmic:prxattrib->encrypt == WLAN_CIPHER_SUITE_TKIP\n")); 302 + "recvframe_chkmic:prxattrib->encrypt == WLAN_CIPHER_SUITE_TKIP\n"); 303 303 RT_TRACE(_module_rtl871x_recv_c_, _drv_info_, 304 - ("\n recvframe_chkmic:da = %pM\n", prxattrib->ra)); 304 + "recvframe_chkmic:da = %pM\n", prxattrib->ra); 305 305 306 306 /* calculate mic code */ 307 307 if (stainfo != NULL) { ··· 309 309 mickey = &psecuritypriv->dot118021XGrprxmickey[prxattrib->key_index].skey[0]; 310 310 311 311 RT_TRACE(_module_rtl871x_recv_c_, _drv_info_, 312 - ("\n recvframe_chkmic: bcmc key\n")); 312 + "recvframe_chkmic: bcmc key\n"); 313 313 314 314 if (!psecuritypriv->binstallGrpkey) { 315 315 res = _FAIL; 316 316 RT_TRACE(_module_rtl871x_recv_c_, 317 317 _drv_err_, 318 - ("\n recvframe_chkmic:didn't " 319 - "install group key!!!!!!\n")); 318 + "recvframe_chkmic:didn't install group key!\n"); 320 319 DBG_8723A("\n recvframe_chkmic:didn't " 321 320 "install group key!!!!!!\n"); 322 321 goto exit; ··· 323 324 } else { 324 325 mickey = &stainfo->dot11tkiprxmickey.skey[0]; 325 326 RT_TRACE(_module_rtl871x_recv_c_, _drv_err_, 326 - ("\n recvframe_chkmic: unicast " 327 - "key\n")); 327 + "recvframe_chkmic: unicast key\n"); 328 328 } 329 329 330 330 /* icv_len included the mic code */ ··· 334 336 prxattrib->iv_len; 335 337 336 338 RT_TRACE(_module_rtl871x_recv_c_, _drv_info_, 337 - ("\n prxattrib->iv_len =%d prxattrib->icv_len =" 338 - "%d\n", prxattrib->iv_len, 339 - prxattrib->icv_len)); 339 + "prxattrib->iv_len =%d prxattrib->icv_len =%d\n", 340 + prxattrib->iv_len, prxattrib->icv_len); 340 341 341 342 /* care the length of the data */ 342 343 rtw_seccalctkipmic23a(mickey, pframe, payload, ··· 350 353 if (miccode[i] != *(pframemic + i)) { 351 354 RT_TRACE(_module_rtl871x_recv_c_, 352 355 _drv_err_, 353 - ("recvframe_chkmic:miccode" 354 - "[%d](%02x) != *(pframemic+" 355 - "%d)(%02x) ", i, miccode[i], 356 - i, *(pframemic + i))); 356 + "recvframe_chkmic:miccode[%d](%02x) != *(pframemic+%d)(%02x)\n", 357 + i, miccode[i], 358 + i, *(pframemic + i)); 357 359 bmic_err = true; 358 360 } 359 361 } ··· 361 365 int i; 362 366 363 367 RT_TRACE(_module_rtl871x_recv_c_, _drv_err_, 364 - ("\n *(pframemic-8)-*(pframemic-1) =" 365 - "0x%02x:0x%02x:0x%02x:0x%02x:0x%02x:" 366 - "0x%02x:0x%02x:0x%02x\n", 367 - *(pframemic - 8), *(pframemic - 7), 368 - *(pframemic - 6), *(pframemic - 5), 369 - *(pframemic - 4), *(pframemic - 3), 370 - *(pframemic - 2), *(pframemic - 1))); 368 + "*(pframemic-8)-*(pframemic-1) =0x%02x:0x%02x:0x%02x:0x%02x:0x%02x:0x%02x:0x%02x:0x%02x\n", 369 + *(pframemic - 8), *(pframemic - 7), 370 + *(pframemic - 6), *(pframemic - 5), 371 + *(pframemic - 4), *(pframemic - 3), 372 + *(pframemic - 2), *(pframemic - 1)); 371 373 RT_TRACE(_module_rtl871x_recv_c_, _drv_err_, 372 - ("\n *(pframemic-16)-*(pframemic-9) =" 373 - "0x%02x:0x%02x:0x%02x:0x%02x:0x%02x:" 374 - "0x%02x:0x%02x:0x%02x\n", 375 - *(pframemic - 16), *(pframemic - 15), 376 - *(pframemic - 14), *(pframemic - 13), 377 - *(pframemic - 12), *(pframemic - 11), 378 - *(pframemic - 10), *(pframemic - 9))); 374 + "*(pframemic-16)-*(pframemic-9) =0x%02x:0x%02x:0x%02x:0x%02x:0x%02x:0x%02x:0x%02x:0x%02x\n", 375 + *(pframemic - 16), *(pframemic - 15), 376 + *(pframemic - 14), *(pframemic - 13), 377 + *(pframemic - 12), *(pframemic - 11), 378 + *(pframemic - 10), *(pframemic - 9)); 379 379 380 380 RT_TRACE(_module_rtl871x_recv_c_, _drv_err_, 381 - ("\n ====== demp packet (len =%d) ======" 382 - "\n", precvframe->pkt->len)); 381 + "====== demp packet (len =%d) ======\n", 382 + precvframe->pkt->len); 383 383 for (i = 0; i < precvframe->pkt->len; i = i + 8) { 384 384 RT_TRACE(_module_rtl871x_recv_c_, 385 - _drv_err_, ("0x%02x:0x%02x:0x" 386 - "%02x:0x%02x:0x%0" 387 - "2x:0x%02x:0x%02x" 388 - ":0x%02x", 389 - *(precvframe->pkt->data+i),*(precvframe->pkt->data+i+1), 390 - *(precvframe->pkt->data+i+2),*(precvframe->pkt->data+i+3), 391 - *(precvframe->pkt->data+i+4),*(precvframe->pkt->data+i+5), 392 - *(precvframe->pkt->data+i+6),*(precvframe->pkt->data+i+7))); 385 + _drv_err_, 386 + "0x%02x:0x%02x:0x%02x:0x%02x:0x%02x:0x%02x:0x%02x:0x%02x\n", 387 + *(precvframe->pkt->data+i), 388 + *(precvframe->pkt->data+i+1), 389 + *(precvframe->pkt->data+i+2), 390 + *(precvframe->pkt->data+i+3), 391 + *(precvframe->pkt->data+i+4), 392 + *(precvframe->pkt->data+i+5), 393 + *(precvframe->pkt->data+i+6), 394 + *(precvframe->pkt->data+i+7)); 393 395 } 394 396 RT_TRACE(_module_rtl871x_recv_c_, _drv_err_, 395 - ("\n ====== demp packet end [len =%d]" 396 - "======\n", precvframe->pkt->len)); 397 + "====== demp packet end [len =%d]======\n", 398 + precvframe->pkt->len); 397 399 RT_TRACE(_module_rtl871x_recv_c_, _drv_err_, 398 - ("\n hrdlen =%d,\n", 399 - prxattrib->hdrlen)); 400 + "hrdlen =%d\n", prxattrib->hdrlen); 400 401 401 402 RT_TRACE(_module_rtl871x_recv_c_, _drv_err_, 402 - ("ra = %pM psecuritypriv->binstallGrpkey =%d ", 403 - prxattrib->ra, 404 - psecuritypriv->binstallGrpkey)); 403 + "ra = %pM psecuritypriv->binstallGrpkey =%d\n", 404 + prxattrib->ra, 405 + psecuritypriv->binstallGrpkey); 405 406 406 407 /* double check key_index for some timing 407 408 issue, cannot compare with ··· 412 419 if ((prxattrib->bdecrypted == true) && 413 420 (brpt_micerror == true)) { 414 421 rtw_handle_tkip_mic_err23a(adapter, (u8)is_multicast_ether_addr(prxattrib->ra)); 415 - RT_TRACE(_module_rtl871x_recv_c_, _drv_err_, (" mic error :prxattrib->bdecrypted =%d ", prxattrib->bdecrypted)); 422 + RT_TRACE(_module_rtl871x_recv_c_, _drv_err_, 423 + "mic error :prxattrib->bdecrypted =%d\n", 424 + prxattrib->bdecrypted); 416 425 DBG_8723A(" mic error :prxattrib->" 417 426 "bdecrypted =%d\n", 418 427 prxattrib->bdecrypted); 419 428 } else { 420 429 RT_TRACE(_module_rtl871x_recv_c_, 421 430 _drv_err_, 422 - (" mic error :prxattrib->" 423 - "bdecrypted =%d ", 424 - prxattrib->bdecrypted)); 431 + "mic error :prxattrib->bdecrypted =%d\n", 432 + prxattrib->bdecrypted); 425 433 DBG_8723A(" mic error :prxattrib->" 426 434 "bdecrypted =%d\n", 427 435 prxattrib->bdecrypted); ··· 436 442 psecuritypriv->bcheck_grpkey = 1; 437 443 RT_TRACE(_module_rtl871x_recv_c_, 438 444 _drv_err_, 439 - ("psecuritypriv->bcheck_grp" 440 - "key = true")); 445 + "psecuritypriv->bcheck_grpkey = true\n"); 441 446 } 442 447 } 443 448 } else { 444 449 RT_TRACE(_module_rtl871x_recv_c_, _drv_err_, 445 - ("recvframe_chkmic: rtw_get_stainfo23a ==" 446 - "NULL!!!\n")); 450 + "recvframe_chkmic: rtw_get_stainfo23a ==NULL!!!\n"); 447 451 } 448 452 449 453 skb_trim(precvframe->pkt, precvframe->pkt->len - 8); ··· 466 474 int res = _SUCCESS; 467 475 468 476 RT_TRACE(_module_rtl871x_recv_c_, _drv_info_, 469 - ("prxstat->decrypted =%x prxattrib->encrypt = 0x%03x\n", 470 - prxattrib->bdecrypted, prxattrib->encrypt)); 477 + "prxstat->decrypted =%x prxattrib->encrypt = 0x%03x\n", 478 + prxattrib->bdecrypted, prxattrib->encrypt); 471 479 472 480 if (prxattrib->encrypt > 0) { 473 481 u8 *iv = precv_frame->pkt->data + prxattrib->hdrlen; ··· 550 558 psta = rtw_get_stainfo23a(pstapriv, psta_addr); 551 559 552 560 RT_TRACE(_module_rtl871x_recv_c_, _drv_info_, 553 - ("########portctrl:adapter->securitypriv.dot11AuthAlgrthm =" 554 - "%d\n", adapter->securitypriv.dot11AuthAlgrthm)); 561 + "########portctrl:adapter->securitypriv.dot11AuthAlgrthm =%d\n", 562 + adapter->securitypriv.dot11AuthAlgrthm); 555 563 556 564 prtnframe = precv_frame; 557 565 ··· 565 573 /* blocked */ 566 574 /* only accept EAPOL frame */ 567 575 RT_TRACE(_module_rtl871x_recv_c_, _drv_info_, 568 - ("########portctrl:psta->ieee8021x_blocked ==" 569 - "1\n")); 576 + "########portctrl:psta->ieee8021x_blocked ==1\n"); 570 577 571 578 if (ether_type != eapol_type) { 572 579 /* free this frame */ ··· 592 601 593 602 if (tid > 15) { 594 603 RT_TRACE(_module_rtl871x_recv_c_, _drv_notice_, 595 - ("recv_decache, (tid>15)! seq_ctrl = 0x%x, tid = 0x%x\n", 596 - seq_ctrl, tid)); 604 + "recv_decache, (tid>15)! seq_ctrl = 0x%x, tid = 0x%x\n", 605 + seq_ctrl, tid); 597 606 598 607 return _FAIL; 599 608 } ··· 601 610 if (1) { /* if (bretry) */ 602 611 if (seq_ctrl == prxcache->tid_rxseq[tid]) { 603 612 RT_TRACE(_module_rtl871x_recv_c_, _drv_notice_, 604 - ("recv_decache, seq_ctrl = 0x%x, tid = 0x%x, " 605 - "tid_rxseq = 0x%x\n", 606 - seq_ctrl, tid, prxcache->tid_rxseq[tid])); 613 + "recv_decache, seq_ctrl = 0x%x, tid = 0x%x, tid_rxseq = 0x%x\n", 614 + seq_ctrl, tid, prxcache->tid_rxseq[tid]); 607 615 608 616 return _FAIL; 609 617 } ··· 760 770 /* filter packets that SA is myself or multicast or broadcast */ 761 771 if (ether_addr_equal(myhwaddr, pattrib->src)) { 762 772 RT_TRACE(_module_rtl871x_recv_c_, _drv_err_, 763 - (" SA == myself\n")); 773 + "SA == myself\n"); 764 774 ret = _FAIL; 765 775 goto exit; 766 776 } ··· 783 793 and DA is my mac-address */ 784 794 if (!ether_addr_equal(pattrib->bssid, pattrib->src)) { 785 795 RT_TRACE(_module_rtl871x_recv_c_, _drv_err_, 786 - ("bssid != TA under STATION_MODE; drop " 787 - "pkt\n")); 796 + "bssid != TA under STATION_MODE; drop pkt\n"); 788 797 ret = _FAIL; 789 798 goto exit; 790 799 } ··· 825 836 *psta = rtw_get_stainfo23a(pstapriv, sta_addr); /* get ap_info */ 826 837 827 838 if (*psta == NULL) { 828 - RT_TRACE(_module_rtl871x_recv_c_, _drv_err_, ("can't get psta under sta2sta_data_frame ; drop pkt\n")); 839 + RT_TRACE(_module_rtl871x_recv_c_, _drv_err_, 840 + "can't get psta under sta2sta_data_frame ; drop pkt\n"); 829 841 ret = _FAIL; 830 842 goto exit; 831 843 } ··· 862 872 /* filter packets that SA is myself or multicast or broadcast */ 863 873 if (ether_addr_equal(myhwaddr, pattrib->src)) { 864 874 RT_TRACE(_module_rtl871x_recv_c_, _drv_err_, 865 - (" SA == myself\n")); 875 + "SA == myself\n"); 866 876 ret = _FAIL; 867 877 goto exit; 868 878 } ··· 870 880 /* da should be for me */ 871 881 if (!ether_addr_equal(myhwaddr, pattrib->dst) && !bmcast) { 872 882 RT_TRACE(_module_rtl871x_recv_c_, _drv_info_, 873 - (" ap2sta_data_frame: compare DA fail; DA=%pM\n", 874 - pattrib->dst)); 883 + "ap2sta_data_frame: compare DA failed; DA=%pM\n", 884 + pattrib->dst); 875 885 ret = _FAIL; 876 886 goto exit; 877 887 } ··· 881 891 ether_addr_equal(mybssid, "\x0\x0\x0\x0\x0\x0") || 882 892 !ether_addr_equal(pattrib->bssid, mybssid)) { 883 893 RT_TRACE(_module_rtl871x_recv_c_, _drv_info_, 884 - (" ap2sta_data_frame: compare BSSID fail ; BSSID=%pM\n", 885 - pattrib->bssid)); 894 + "ap2sta_data_frame: compare BSSID failed; BSSID=%pM\n", 895 + pattrib->bssid); 886 896 RT_TRACE(_module_rtl871x_recv_c_, _drv_info_, 887 - ("mybssid=%pM\n", mybssid)); 897 + "mybssid=%pM\n", mybssid); 888 898 889 899 if (!bmcast) { 890 900 DBG_8723A("issue_deauth23a to the nonassociated ap=%pM for the reason(7)\n", ··· 905 915 906 916 if (*psta == NULL) { 907 917 RT_TRACE(_module_rtl871x_recv_c_, _drv_err_, 908 - ("ap2sta: can't get psta under STATION_MODE ;" 909 - " drop pkt\n")); 918 + "ap2sta: can't get psta under STATION_MODE; drop pkt\n"); 910 919 ret = _FAIL; 911 920 goto exit; 912 921 } ··· 933 944 *psta = rtw_get_stainfo23a(pstapriv, pattrib->bssid); 934 945 if (*psta == NULL) { 935 946 RT_TRACE(_module_rtl871x_recv_c_, _drv_err_, 936 - ("can't get psta under MP_MODE ; drop pkt\n")); 947 + "can't get psta under MP_MODE ; drop pkt\n"); 937 948 ret = _FAIL; 938 949 goto exit; 939 950 } ··· 990 1001 *psta = rtw_get_stainfo23a(pstapriv, pattrib->src); 991 1002 if (*psta == NULL) { 992 1003 RT_TRACE(_module_rtl871x_recv_c_, _drv_err_, 993 - ("can't get psta under AP_MODE; drop pkt\n")); 1004 + "can't get psta under AP_MODE; drop pkt\n"); 994 1005 DBG_8723A("issue_deauth23a to sta=%pM for the reason(7)\n", 995 1006 pattrib->src); 996 1007 ··· 1193 1204 /* struct mlme_priv *pmlmepriv = &adapter->mlmepriv; */ 1194 1205 1195 1206 RT_TRACE(_module_rtl871x_recv_c_, _drv_info_, 1196 - ("+validate_recv_mgnt_frame\n")); 1207 + "+validate_recv_mgnt_frame\n"); 1197 1208 1198 1209 precv_frame = recvframe_chk_defrag23a(padapter, precv_frame); 1199 1210 if (precv_frame == NULL) { 1200 1211 RT_TRACE(_module_rtl871x_recv_c_, _drv_notice_, 1201 - ("%s: fragment packet\n", __func__)); 1212 + "%s: fragment packet\n", __func__); 1202 1213 return _SUCCESS; 1203 1214 } 1204 1215 ··· 1284 1295 ether_addr_copy(pattrib->ra, hdr->addr1); 1285 1296 ether_addr_copy(pattrib->ta, hdr->addr2); 1286 1297 ret = _FAIL; 1287 - RT_TRACE(_module_rtl871x_recv_c_, _drv_err_, (" case 3\n")); 1298 + RT_TRACE(_module_rtl871x_recv_c_, _drv_err_, "case 3\n"); 1288 1299 break; 1289 1300 } 1290 1301 ··· 1293 1304 1294 1305 if (!psta) { 1295 1306 RT_TRACE(_module_rtl871x_recv_c_, _drv_err_, 1296 - (" after to_fr_ds_chk; psta == NULL\n")); 1307 + "after to_fr_ds_chk; psta == NULL\n"); 1297 1308 ret = _FAIL; 1298 1309 goto exit; 1299 1310 } ··· 1336 1347 if (recv_decache(precv_frame, bretry, &psta->sta_recvpriv.rxcache) == 1337 1348 _FAIL) { 1338 1349 RT_TRACE(_module_rtl871x_recv_c_, _drv_err_, 1339 - ("decache : drop pkt\n")); 1350 + "decache : drop pkt\n"); 1340 1351 ret = _FAIL; 1341 1352 goto exit; 1342 1353 } 1343 1354 1344 1355 if (pattrib->privacy) { 1345 1356 RT_TRACE(_module_rtl871x_recv_c_, _drv_info_, 1346 - ("validate_recv_data_frame:pattrib->privacy =%x\n", 1347 - pattrib->privacy)); 1357 + "validate_recv_data_frame:pattrib->privacy =%x\n", 1358 + pattrib->privacy); 1348 1359 RT_TRACE(_module_rtl871x_recv_c_, _drv_info_, 1349 - ("\n ^^^^^^^^^^^is_multicast_ether_addr" 1350 - "(pattrib->ra(0x%02x)) =%d^^^^^^^^^^^^^^^6\n", 1351 - pattrib->ra[0], 1352 - is_multicast_ether_addr(pattrib->ra))); 1360 + "^^^^^^^^^^^is_multicast_ether_addr(pattrib->ra(0x%02x)) =%d^^^^^^^^^^^^^^^6\n", 1361 + pattrib->ra[0], 1362 + is_multicast_ether_addr(pattrib->ra)); 1353 1363 1354 1364 GET_ENCRY_ALGO(psecuritypriv, psta, pattrib->encrypt, 1355 1365 is_multicast_ether_addr(pattrib->ra)); 1356 1366 1357 1367 RT_TRACE(_module_rtl871x_recv_c_, _drv_info_, 1358 - ("\n pattrib->encrypt =%d\n", pattrib->encrypt)); 1368 + "pattrib->encrypt =%d\n", pattrib->encrypt); 1359 1369 1360 1370 switch (pattrib->encrypt) { 1361 1371 case WLAN_CIPHER_SUITE_WEP40: ··· 1435 1447 /* add version chk */ 1436 1448 if (ver != 0) { 1437 1449 RT_TRACE(_module_rtl871x_recv_c_, _drv_err_, 1438 - ("validate_recv_data_frame fail! (ver!= 0)\n")); 1450 + "validate_recv_data_frame fail! (ver!= 0)\n"); 1439 1451 retval = _FAIL; 1440 1452 goto exit; 1441 1453 } ··· 1460 1472 retval = validate_recv_mgnt_frame(adapter, precv_frame); 1461 1473 if (retval == _FAIL) { 1462 1474 RT_TRACE(_module_rtl871x_recv_c_, _drv_err_, 1463 - ("validate_recv_mgnt_frame fail\n")); 1475 + "validate_recv_mgnt_frame fail\n"); 1464 1476 } 1465 1477 retval = _FAIL; /* only data frame return _SUCCESS */ 1466 1478 break; ··· 1468 1480 retval = validate_recv_ctrl_frame(adapter, precv_frame); 1469 1481 if (retval == _FAIL) { 1470 1482 RT_TRACE(_module_rtl871x_recv_c_, _drv_err_, 1471 - ("validate_recv_ctrl_frame fail\n")); 1483 + "validate_recv_ctrl_frame fail\n"); 1472 1484 } 1473 1485 retval = _FAIL; /* only data frame return _SUCCESS */ 1474 1486 break; ··· 1477 1489 retval = validate_recv_data_frame(adapter, precv_frame); 1478 1490 if (retval == _FAIL) { 1479 1491 struct recv_priv *precvpriv = &adapter->recvpriv; 1480 - /* RT_TRACE(_module_rtl871x_recv_c_, _drv_err_, ("validate_recv_data_frame fail\n")); */ 1492 + 1481 1493 precvpriv->rx_drop++; 1482 1494 } 1483 1495 break; 1484 1496 default: 1485 1497 RT_TRACE(_module_rtl871x_recv_c_, _drv_err_, 1486 - ("validate_recv_data_frame fail! type = 0x%x\n", type)); 1498 + "validate_recv_data_frame fail! type = 0x%x\n", type); 1487 1499 retval = _FAIL; 1488 1500 break; 1489 1501 } ··· 1530 1542 len = skb->len - hdrlen; 1531 1543 1532 1544 RT_TRACE(_module_rtl871x_recv_c_, _drv_info_, 1533 - ("\n === pattrib->hdrlen: %x, pattrib->iv_len:%x ===\n\n", 1534 - pattrib->hdrlen, pattrib->iv_len)); 1545 + "=== pattrib->hdrlen: %x, pattrib->iv_len:%x ===\n", 1546 + pattrib->hdrlen, pattrib->iv_len); 1535 1547 1536 1548 pattrib->eth_type = eth_type; 1537 1549 if (check_fwstate(pmlmepriv, WIFI_MP_STATE)) { ··· 1643 1655 rtw_free_recvframe23a_queue(defrag_q); 1644 1656 1645 1657 RT_TRACE(_module_rtl871x_recv_c_, _drv_info_, 1646 - ("Performance defrag!!!!!\n")); 1658 + "Performance defrag!!!!!\n"); 1647 1659 1648 1660 1649 1661 ··· 1714 1726 /* spin_unlock(&pdefrag_q->lock); */ 1715 1727 1716 1728 RT_TRACE(_module_rtl871x_recv_c_, _drv_info_, 1717 - ("Enqueuq: ismfrag = %d, fragnum = %d\n", 1718 - ismfrag, fragnum)); 1729 + "Enqueuq: ismfrag = %d, fragnum = %d\n", 1730 + ismfrag, fragnum); 1719 1731 1720 1732 prtnframe = NULL; 1721 1733 ··· 1725 1737 rtw_free_recvframe23a(precv_frame); 1726 1738 prtnframe = NULL; 1727 1739 RT_TRACE(_module_rtl871x_recv_c_, _drv_err_, 1728 - ("Free because pdefrag_q == NULL: ismfrag = " 1729 - "%d, fragnum = %d\n", ismfrag, fragnum)); 1740 + "Free because pdefrag_q == NULL: ismfrag = %d, fragnum = %d\n", 1741 + ismfrag, fragnum); 1730 1742 } 1731 1743 } 1732 1744 ··· 1741 1753 1742 1754 /* call recvframe_defrag to defrag */ 1743 1755 RT_TRACE(_module_rtl871x_recv_c_, _drv_info_, 1744 - ("defrag: ismfrag = %d, fragnum = %d\n", 1745 - ismfrag, fragnum)); 1756 + "defrag: ismfrag = %d, fragnum = %d\n", 1757 + ismfrag, fragnum); 1746 1758 precv_frame = recvframe_defrag(padapter, pdefrag_q); 1747 1759 prtnframe = precv_frame; 1748 1760 } else { ··· 1751 1763 rtw_free_recvframe23a(precv_frame); 1752 1764 prtnframe = NULL; 1753 1765 RT_TRACE(_module_rtl871x_recv_c_, _drv_err_, 1754 - ("Free because pdefrag_q == NULL: ismfrag = " 1755 - "%d, fragnum = %d\n", ismfrag, fragnum)); 1766 + "Free because pdefrag_q == NULL: ismfrag = %d, fragnum = %d\n", 1767 + ismfrag, fragnum); 1756 1768 } 1757 1769 1758 1770 } ··· 1761 1773 /* after defrag we must check tkip mic code */ 1762 1774 if (recvframe_chkmic(padapter, prtnframe) == _FAIL) { 1763 1775 RT_TRACE(_module_rtl871x_recv_c_, _drv_err_, 1764 - ("recvframe_chkmic(padapter, prtnframe) ==" 1765 - "_FAIL\n")); 1776 + "recvframe_chkmic(padapter, prtnframe) ==_FAIL\n"); 1766 1777 rtw_free_recvframe23a(prtnframe); 1767 1778 prtnframe = NULL; 1768 1779 } ··· 1860 1873 continue; 1861 1874 } else if (SN_EQUAL(pnextattrib->seq_num, pattrib->seq_num)) { 1862 1875 /* Duplicate entry is found!! Do not insert current entry. */ 1863 - /* RT_TRACE(COMP_RX_REORDER, DBG_TRACE, ("InsertRxReorderList(): Duplicate packet is dropped!! IndicateSeq: %d, NewSeq: %d\n", pTS->RxIndicateSeq, SeqNum)); */ 1864 1876 1865 1877 /* spin_unlock_irqrestore(&ppending_recvframe_queue->lock); */ 1866 1878 return false; ··· 1880 1894 /* spin_unlock_ex(&ppending_recvframe_queue->lock); */ 1881 1895 /* spin_unlock_irqrestore(&ppending_recvframe_queue->lock); */ 1882 1896 1883 - /* RT_TRACE(COMP_RX_REORDER, DBG_TRACE, ("InsertRxReorderList(): Pkt insert into buffer!! IndicateSeq: %d, NewSeq: %d\n", pTS->RxIndicateSeq, SeqNum)); */ 1884 1897 return true; 1885 1898 } 1886 1899 ··· 1931 1946 1932 1947 if (!SN_LESS(preorder_ctrl->indicate_seq, pattrib->seq_num)) { 1933 1948 RT_TRACE(_module_rtl871x_recv_c_, _drv_notice_, 1934 - ("recv_indicatepkts_in_order: indicate =%d " 1935 - "seq =%d amsdu =%d\n", 1936 - preorder_ctrl->indicate_seq, 1937 - pattrib->seq_num, pattrib->amsdu)); 1949 + "recv_indicatepkts_in_order: indicate =%d seq =%d amsdu =%d\n", 1950 + preorder_ctrl->indicate_seq, 1951 + pattrib->seq_num, pattrib->amsdu); 1938 1952 1939 1953 plist = plist->next; 1940 1954 list_del_init(&prframe->list); ··· 1995 2011 if ((padapter->bDriverStopped == false) && 1996 2012 (padapter->bSurpriseRemoved == false)) { 1997 2013 RT_TRACE(_module_rtl871x_recv_c_, _drv_notice_, 1998 - ("@@@@ recv_indicatepkt_reorder -" 1999 - "recv_func recv_indicatepkt\n")); 2014 + "@@@@ recv_indicatepkt_reorder -recv_func recv_indicatepkt\n"); 2000 2015 2001 2016 rtw_recv_indicatepkt23a(padapter, prframe); 2002 2017 return _SUCCESS; ··· 2028 2045 spin_lock_bh(&ppending_recvframe_queue->lock); 2029 2046 2030 2047 RT_TRACE(_module_rtl871x_recv_c_, _drv_notice_, 2031 - ("recv_indicatepkt_reorder: indicate =%d seq =%d\n", 2032 - preorder_ctrl->indicate_seq, pattrib->seq_num)); 2048 + "recv_indicatepkt_reorder: indicate =%d seq =%d\n", 2049 + preorder_ctrl->indicate_seq, pattrib->seq_num); 2033 2050 2034 2051 /* s2. check if winstart_b(indicate_seq) needs to been updated */ 2035 2052 if (!check_indicate_seq(preorder_ctrl, pattrib->seq_num)) { ··· 2122 2139 retval = wlanhdr_to_ethhdr(prframe); 2123 2140 if (retval != _SUCCESS) { 2124 2141 RT_TRACE(_module_rtl871x_recv_c_, _drv_err_, 2125 - ("wlanhdr_to_ethhdr: drop pkt\n")); 2142 + "wlanhdr_to_ethhdr: drop pkt\n"); 2126 2143 return retval; 2127 2144 } 2128 2145 ··· 2130 2147 (padapter->bSurpriseRemoved == false)) { 2131 2148 /* indicate this recv_frame */ 2132 2149 RT_TRACE(_module_rtl871x_recv_c_, _drv_notice_, 2133 - ("@@@@ process_recv_indicatepkts- " 2134 - "recv_func recv_indicatepkt\n")); 2150 + "@@@@ process_recv_indicatepkts- recv_func recv_indicatepkt\n"); 2135 2151 rtw_recv_indicatepkt23a(padapter, prframe); 2136 2152 } else { 2137 2153 RT_TRACE(_module_rtl871x_recv_c_, _drv_notice_, 2138 - ("@@@@ process_recv_indicatepkts- " 2139 - "recv_func free_indicatepkt\n")); 2154 + "@@@@ process_recv_indicatepkts- recv_func free_indicatepkt\n"); 2140 2155 2141 2156 RT_TRACE(_module_rtl871x_recv_c_, _drv_notice_, 2142 - ("recv_func:bDriverStopped(%d) OR " 2143 - "bSurpriseRemoved(%d)", 2144 - padapter->bDriverStopped, 2145 - padapter->bSurpriseRemoved)); 2157 + "recv_func:bDriverStopped(%d) OR bSurpriseRemoved(%d)\n", 2158 + padapter->bDriverStopped, 2159 + padapter->bSurpriseRemoved); 2146 2160 retval = _FAIL; 2147 2161 return retval; 2148 2162 } ··· 2158 2178 ret = validate_recv_frame(padapter, rframe); 2159 2179 if (ret != _SUCCESS) { 2160 2180 RT_TRACE(_module_rtl871x_recv_c_, _drv_info_, 2161 - ("recv_func: validate_recv_frame fail! drop pkt\n")); 2181 + "recv_func: validate_recv_frame fail! drop pkt\n"); 2162 2182 rtw_free_recvframe23a(rframe); 2163 2183 goto exit; 2164 2184 } ··· 2178 2198 prframe = decryptor(padapter, prframe); 2179 2199 if (prframe == NULL) { 2180 2200 RT_TRACE(_module_rtl871x_recv_c_, _drv_err_, 2181 - ("decryptor: drop pkt\n")); 2201 + "decryptor: drop pkt\n"); 2182 2202 ret = _FAIL; 2183 2203 goto _recv_data_drop; 2184 2204 } ··· 2186 2206 prframe = recvframe_chk_defrag23a(padapter, prframe); 2187 2207 if (!prframe) { 2188 2208 RT_TRACE(_module_rtl871x_recv_c_, _drv_err_, 2189 - ("recvframe_chk_defrag23a: drop pkt\n")); 2209 + "recvframe_chk_defrag23a: drop pkt\n"); 2190 2210 goto _recv_data_drop; 2191 2211 } 2192 2212 ··· 2205 2225 prframe = portctrl(padapter, prframe); 2206 2226 if (!prframe) { 2207 2227 RT_TRACE(_module_rtl871x_recv_c_, _drv_err_, 2208 - ("portctrl: drop pkt\n")); 2228 + "portctrl: drop pkt\n"); 2209 2229 ret = _FAIL; 2210 2230 goto _recv_data_drop; 2211 2231 } ··· 2215 2235 ret = process_recv_indicatepkts(padapter, prframe); 2216 2236 if (ret != _SUCCESS) { 2217 2237 RT_TRACE(_module_rtl871x_recv_c_, _drv_err_, 2218 - ("recv_func: process_recv_indicatepkts fail!\n")); 2238 + "recv_func: process_recv_indicatepkts fail!\n"); 2219 2239 rtw_free_recvframe23a(orig_prframe);/* free this recv_frame */ 2220 2240 goto _recv_data_drop; 2221 2241 }
+34 -24
drivers/staging/rtl8723au/core/rtw_security.c
··· 248 248 if (crc[3] != payload[length - 1] || crc[2] != payload[length - 2] || 249 249 crc[1] != payload[length - 3] || crc[0] != payload[length - 4]) { 250 250 RT_TRACE(_module_rtl871x_security_c_, _drv_err_, 251 - ("rtw_wep_decrypt23a:icv error crc[3](%x)!= payload" 252 - "[length-1](%x) || crc[2](%x)!= payload[length-2](%x)" 253 - " || crc[1](%x)!= payload[length-3](%x) || crc[0](%x)" 254 - "!= payload[length-4](%x)\n", 255 - crc[3], payload[length - 1], 256 - crc[2], payload[length - 2], 257 - crc[1], payload[length - 3], 258 - crc[0], payload[length - 4])); 251 + "rtw_wep_decrypt23a:icv error crc[3](%x)!= payload[length-1](%x) || crc[2](%x)!= payload[length-2](%x) || crc[1](%x)!= payload[length-3](%x) || crc[0](%x)!= payload[length-4](%x)\n", 252 + crc[3], payload[length - 1], 253 + crc[2], payload[length - 2], 254 + crc[1], payload[length - 3], 255 + crc[0], payload[length - 4]); 259 256 } 260 257 } 261 258 ··· 641 644 return _FAIL; 642 645 } 643 646 644 - RT_TRACE(_module_rtl871x_security_c_, _drv_err_, ("rtw_tkip_encrypt23a: stainfo!= NULL!!!\n")); 647 + RT_TRACE(_module_rtl871x_security_c_, _drv_err_, 648 + "rtw_tkip_encrypt23a: stainfo!= NULL!!!\n"); 645 649 646 650 if (is_multicast_ether_addr(pattrib->ra)) 647 651 prwskey = psecuritypriv->dot118021XGrpKey[psecuritypriv->dot118021XGrpKeyid].skey; ··· 666 668 667 669 if ((curfragnum+1) == pattrib->nr_frags) { /* 4 the last fragment */ 668 670 length = pattrib->last_txcmdsz-pattrib->hdrlen-pattrib->iv_len- pattrib->icv_len; 669 - RT_TRACE(_module_rtl871x_security_c_, _drv_info_, ("pattrib->iv_len =%x, pattrib->icv_len =%x\n", pattrib->iv_len, pattrib->icv_len)); 671 + RT_TRACE(_module_rtl871x_security_c_, _drv_info_, 672 + "pattrib->iv_len =%x, pattrib->icv_len =%x\n", 673 + pattrib->iv_len, 674 + pattrib->icv_len); 670 675 *((u32 *)crc) = cpu_to_le32(getcrc32(payload, length));/* modified by Amy*/ 671 676 672 677 arcfour_init(&mycontext, rc4key, 16); ··· 691 690 692 691 } 693 692 else{ 694 - RT_TRACE(_module_rtl871x_security_c_, _drv_err_, ("rtw_tkip_encrypt23a: stainfo == NULL!!!\n")); 693 + RT_TRACE(_module_rtl871x_security_c_, _drv_err_, 694 + "rtw_tkip_encrypt23a: stainfo == NULL!!!\n"); 695 695 DBG_8723A("%s, psta == NUL\n", __func__); 696 696 res = _FAIL; 697 697 } ··· 740 738 prwskey = psecuritypriv->dot118021XGrpKey[prxattrib->key_index].skey; 741 739 prwskeylen = 16; 742 740 } else { 743 - RT_TRACE(_module_rtl871x_security_c_, _drv_err_, ("rtw_tkip_decrypt23a: stainfo!= NULL!!!\n")); 741 + RT_TRACE(_module_rtl871x_security_c_, _drv_err_, 742 + "rtw_tkip_decrypt23a: stainfo!= NULL!!!\n"); 744 743 prwskey = &stainfo->dot118021x_UncstKey.skey[0]; 745 744 prwskeylen = 16; 746 745 } ··· 766 763 767 764 if (crc[3]!= payload[length-1] || crc[2]!= payload[length-2] || crc[1]!= payload[length-3] || crc[0]!= payload[length-4]) 768 765 { 769 - RT_TRACE(_module_rtl871x_security_c_, _drv_err_, ("rtw_wep_decrypt23a:icv error crc[3](%x)!= payload[length-1](%x) || crc[2](%x)!= payload[length-2](%x) || crc[1](%x)!= payload[length-3](%x) || crc[0](%x)!= payload[length-4](%x)\n", 770 - crc[3], payload[length-1], crc[2], payload[length-2], crc[1], payload[length-3], crc[0], payload[length-4])); 766 + RT_TRACE(_module_rtl871x_security_c_, _drv_err_, 767 + "rtw_wep_decrypt23a:icv error crc[3](%x)!= payload[length-1](%x) || crc[2](%x)!= payload[length-2](%x) || crc[1](%x)!= payload[length-3](%x) || crc[0](%x)!= payload[length-4](%x)\n", 768 + crc[3], payload[length-1], 769 + crc[2], payload[length-2], 770 + crc[1], payload[length-3], 771 + crc[0], payload[length-4]); 771 772 res = _FAIL; 772 773 } 773 774 } else { 774 - RT_TRACE(_module_rtl871x_security_c_, _drv_err_, ("rtw_tkip_decrypt23a: stainfo == NULL!!!\n")); 775 + RT_TRACE(_module_rtl871x_security_c_, _drv_err_, 776 + "rtw_tkip_decrypt23a: stainfo == NULL!!!\n"); 775 777 res = _FAIL; 776 778 } 777 779 } ··· 1312 1304 1313 1305 if (!stainfo) { 1314 1306 RT_TRACE(_module_rtl871x_security_c_, _drv_err_, 1315 - ("rtw_aes_encrypt23a: stainfo == NULL!!!\n")); 1307 + "rtw_aes_encrypt23a: stainfo == NULL!!!\n"); 1316 1308 DBG_8723A("%s, psta == NUL\n", __func__); 1317 1309 res = _FAIL; 1318 1310 goto out; ··· 1323 1315 return _FAIL; 1324 1316 } 1325 1317 RT_TRACE(_module_rtl871x_security_c_, _drv_err_, 1326 - ("rtw_aes_encrypt23a: stainfo!= NULL!!!\n")); 1318 + "rtw_aes_encrypt23a: stainfo!= NULL!!!\n"); 1327 1319 1328 1320 if (is_multicast_ether_addr(pattrib->ra)) 1329 1321 prwskey = psecuritypriv->dot118021XGrpKey[psecuritypriv->dot118021XGrpKeyid].skey; ··· 1552 1544 for (i = 0; i < 8; i++) { 1553 1545 if (pframe[hdrlen+8+plen-8+i] != message[hdrlen+8+plen-8+i]) { 1554 1546 RT_TRACE(_module_rtl871x_security_c_, _drv_err_, 1555 - ("aes_decipher:mic check error mic[%d]: pframe(%x) != message(%x)\n", 1556 - i, pframe[hdrlen+8+plen-8+i], message[hdrlen+8+plen-8+i])); 1547 + "aes_decipher:mic check error mic[%d]: pframe(%x) != message(%x)\n", 1548 + i, pframe[hdrlen + 8 + plen - 8 + i], 1549 + message[hdrlen + 8 + plen - 8 + i]); 1557 1550 DBG_8723A("aes_decipher:mic check error mic[%d]: pframe(%x) != message(%x)\n", 1558 1551 i, pframe[hdrlen+8+plen-8+i], message[hdrlen+8+plen-8+i]); 1559 1552 res = _FAIL; ··· 1582 1573 stainfo = rtw_get_stainfo23a(&padapter->stapriv, &prxattrib->ta[0]); 1583 1574 if (!stainfo) { 1584 1575 RT_TRACE(_module_rtl871x_security_c_, _drv_err_, 1585 - ("rtw_aes_encrypt23a: stainfo == NULL!!!\n")); 1576 + "rtw_aes_encrypt23a: stainfo == NULL!!!\n"); 1586 1577 res = _FAIL; 1587 1578 goto exit; 1588 1579 } 1589 1580 1590 1581 RT_TRACE(_module_rtl871x_security_c_, _drv_err_, 1591 - ("rtw_aes_decrypt23a: stainfo!= NULL!!!\n")); 1582 + "rtw_aes_decrypt23a: stainfo!= NULL!!!\n"); 1592 1583 1593 1584 if (is_multicast_ether_addr(prxattrib->ra)) { 1594 1585 /* in concurrent we should use sw decrypt in group key, ··· 1622 1613 { 1623 1614 struct rtw_adapter *padapter = (struct rtw_adapter *)FunctionContext; 1624 1615 1625 - RT_TRACE(_module_rtl871x_security_c_, _drv_err_, ("^^^rtw_use_tkipkey_handler23a ^^^\n")); 1616 + RT_TRACE(_module_rtl871x_security_c_, _drv_err_, 1617 + "^^^rtw_use_tkipkey_handler23a ^^^\n"); 1626 1618 padapter->securitypriv.busetkipkey = 1; 1627 1619 RT_TRACE(_module_rtl871x_security_c_, _drv_err_, 1628 - ("^^^rtw_use_tkipkey_handler23a padapter->securitypriv.busetkipkey =%d^^^\n", 1629 - padapter->securitypriv.busetkipkey)); 1620 + "^^^rtw_use_tkipkey_handler23a padapter->securitypriv.busetkipkey =%d^^^\n", 1621 + padapter->securitypriv.busetkipkey); 1630 1622 }
+7 -9
drivers/staging/rtl8723au/core/rtw_sta_mgt.c
··· 136 136 index = wifi_mac_hash(hwaddr); 137 137 138 138 RT_TRACE(_module_rtl871x_sta_mgt_c_, _drv_info_, 139 - ("rtw_alloc_stainfo23a: index = %x", index)); 139 + "rtw_alloc_stainfo23a: index = %x\n", index); 140 140 if (index >= NUM_STA) { 141 141 RT_TRACE(_module_rtl871x_sta_mgt_c_, _drv_err_, 142 - ("ERROR => rtw_alloc_stainfo23a: index >= NUM_STA")); 142 + "ERROR => rtw_alloc_stainfo23a: index >= NUM_STA\n"); 143 143 psta = NULL; 144 144 goto exit; 145 145 } ··· 160 160 &wRxSeqInitialValue, 2); 161 161 162 162 RT_TRACE(_module_rtl871x_sta_mgt_c_, _drv_info_, 163 - ("alloc number_%d stainfo with hwaddr = %pM\n", 164 - pstapriv->asoc_sta_count, hwaddr)); 163 + "alloc number_%d stainfo with hwaddr = %pM\n", 164 + pstapriv->asoc_sta_count, hwaddr); 165 165 166 166 init_addba_retry_timer23a(psta); 167 167 ··· 249 249 250 250 list_del_init(&psta->hash_list); 251 251 RT_TRACE(_module_rtl871x_sta_mgt_c_, _drv_err_, 252 - ("\n free number_%d stainfo with hwaddr = 0x%.2x 0x%.2x 0x%.2x 0x%.2x 0x%.2x 0x%.2x\n", 253 - pstapriv->asoc_sta_count, psta->hwaddr[0], 254 - psta->hwaddr[1], psta->hwaddr[2], psta->hwaddr[3], 255 - psta->hwaddr[4], psta->hwaddr[5])); 252 + "free number_%d stainfo with hwaddr = %pM\n", 253 + pstapriv->asoc_sta_count, psta->hwaddr); 256 254 pstapriv->asoc_sta_count--; 257 255 258 256 /* re-init sta_info; 20061114 will be init in alloc_stainfo */ ··· 395 397 if (psta == NULL) { 396 398 res = _FAIL; 397 399 RT_TRACE(_module_rtl871x_sta_mgt_c_, _drv_err_, 398 - ("rtw_alloc_stainfo23a fail")); 400 + "rtw_alloc_stainfo23a fail\n"); 399 401 return res; 400 402 } 401 403 /* default broadcast & multicast use macid 1 */
+13 -16
drivers/staging/rtl8723au/core/rtw_wlan_util.c
··· 926 926 } 927 927 928 928 RT_TRACE(_module_rtl871x_mlme_c_, _drv_info_, 929 - ("%s bssid.Ssid.Ssid:%s bssid.Ssid.SsidLength:%d " 930 - "cur_network->network.Ssid.Ssid:%s len:%d\n", __func__, 931 - ssid, ssid_len, cur_network->network.Ssid.ssid, 932 - cur_network->network.Ssid.ssid_len)); 929 + "%s bssid.Ssid.Ssid:%s bssid.Ssid.SsidLength:%d cur_network->network.Ssid.Ssid:%s len:%d\n", 930 + __func__, ssid, ssid_len, cur_network->network.Ssid.ssid, 931 + cur_network->network.Ssid.ssid_len); 933 932 934 933 if (ssid_len != cur_network->network.Ssid.ssid_len || ssid_len > 32 || 935 934 (ssid_len && ··· 946 947 privacy = 0; 947 948 948 949 RT_TRACE(_module_rtl871x_mlme_c_, _drv_info_, 949 - ("%s(): cur_network->network.Privacy is %d, bssid.Privacy " 950 - "is %d\n", __func__, cur_network->network.Privacy, privacy)); 950 + "%s(): cur_network->network.Privacy is %d, bssid.Privacy is %d\n", 951 + __func__, cur_network->network.Privacy, privacy); 951 952 if (cur_network->network.Privacy != privacy) { 952 953 DBG_8723A("%s(), privacy is not match return FAIL\n", __func__); 953 954 goto _mismatch; ··· 961 962 &pairwise_cipher, &is_8021x); 962 963 if (r == _SUCCESS) 963 964 RT_TRACE(_module_rtl871x_mlme_c_, _drv_info_, 964 - ("%s pnetwork->pairwise_cipher: %d, " 965 - "pnetwork->group_cipher: %d, is_802x " 966 - ": %d\n", __func__, pairwise_cipher, 967 - group_cipher, is_8021x)); 965 + "%s pnetwork->pairwise_cipher: %d, pnetwork->group_cipher: %d, is_802x : %d\n", 966 + __func__, pairwise_cipher, 967 + group_cipher, is_8021x); 968 968 } 969 969 } else { 970 970 p = cfg80211_find_vendor_ie(WLAN_OUI_MICROSOFT, ··· 975 977 &pairwise_cipher, &is_8021x); 976 978 if (r == _SUCCESS) 977 979 RT_TRACE(_module_rtl871x_mlme_c_, _drv_info_, 978 - ("%s pnetwork->pairwise_cipher: %d, " 979 - "group_cipher is %d, is_8021x is " 980 - "%d\n", __func__, pairwise_cipher, 981 - group_cipher, is_8021x)); 980 + "%s pnetwork->pairwise_cipher: %d, group_cipher is %d, is_8021x is %d\n", 981 + __func__, pairwise_cipher, 982 + group_cipher, is_8021x); 982 983 } else { 983 984 if (privacy) 984 985 crypto = ENCRYP_PROTOCOL_WEP; ··· 993 996 994 997 if (crypto == ENCRYP_PROTOCOL_WPA || crypto == ENCRYP_PROTOCOL_WPA2) { 995 998 RT_TRACE(_module_rtl871x_mlme_c_, _drv_err_, 996 - ("%s cur_network->group_cipher is %d: %d\n", __func__, 997 - cur_network->BcnInfo.group_cipher, group_cipher)); 999 + "%s cur_network->group_cipher is %d: %d\n", __func__, 1000 + cur_network->BcnInfo.group_cipher, group_cipher); 998 1001 if (pairwise_cipher != cur_network->BcnInfo.pairwise_cipher || 999 1002 group_cipher != cur_network->BcnInfo.group_cipher) { 1000 1003 DBG_8723A("%s pairwise_cipher(%x:%x) or group_cipher "
+92 -89
drivers/staging/rtl8723au/core/rtw_xmit.c
··· 463 463 /* 67 : UDP BOOTP server */ 464 464 RT_TRACE(_module_rtl871x_xmit_c_, 465 465 _drv_err_, 466 - ("======================" 467 - "update_attrib: get DHCP " 468 - "Packet\n")); 466 + "======================update_attrib: get DHCP Packet\n"); 469 467 pattrib->dhcp_pkt = 1; 470 468 } 471 469 } ··· 491 493 psta = rtw_get_stainfo23a(pstapriv, pattrib->ra); 492 494 if (psta == NULL) { /* if we cannot get psta => drrp the pkt */ 493 495 RT_TRACE(_module_rtl871x_xmit_c_, _drv_alert_, 494 - ("\nupdate_attrib => get sta_info fail, ra:%pM\n", 495 - pattrib->ra)); 496 + "update_attrib => get sta_info fail, ra:%pM\n", 497 + pattrib->ra); 496 498 res = _FAIL; 497 499 goto exit; 498 500 } else if (check_fwstate(pmlmepriv, WIFI_AP_STATE) && ··· 509 511 } else { 510 512 /* if we cannot get psta => drop the pkt */ 511 513 RT_TRACE(_module_rtl871x_xmit_c_, _drv_alert_, 512 - ("\nupdate_attrib => get sta_info fail, ra:%pM\n", 513 - pattrib->ra)); 514 + "update_attrib => get sta_info fail, ra:%pM\n", 515 + pattrib->ra); 514 516 res = _FAIL; 515 517 goto exit; 516 518 } ··· 542 544 543 545 if (psta->ieee8021x_blocked == true) { 544 546 RT_TRACE(_module_rtl871x_xmit_c_, _drv_err_, 545 - ("\n psta->ieee8021x_blocked == true\n")); 547 + "psta->ieee8021x_blocked == true\n"); 546 548 547 549 pattrib->encrypt = 0; 548 550 549 551 if ((pattrib->ether_type != ETH_P_PAE) && 550 552 !check_fwstate(pmlmepriv, WIFI_MP_STATE)) { 551 553 RT_TRACE(_module_rtl871x_xmit_c_, _drv_err_, 552 - ("\npsta->ieee8021x_blocked == true, " 553 - "pattrib->ether_type(%.4x) != 0x888e\n", 554 - pattrib->ether_type)); 554 + "psta->ieee8021x_blocked == true, pattrib->ether_type(%.4x) != 0x888e\n", 555 + pattrib->ether_type); 555 556 res = _FAIL; 556 557 goto exit; 557 558 } ··· 591 594 592 595 if (!padapter->securitypriv.busetkipkey) { 593 596 RT_TRACE(_module_rtl871x_xmit_c_, _drv_err_, 594 - ("\npadapter->securitypriv.busetkip" 595 - "key(%d) == false drop packet\n", 596 - padapter->securitypriv.busetkipkey)); 597 + "padapter->securitypriv.busetkipkey(%d) == false drop packet\n", 598 + padapter->securitypriv.busetkipkey); 597 599 res = _FAIL; 598 600 goto exit; 599 601 } ··· 600 604 break; 601 605 case WLAN_CIPHER_SUITE_CCMP: 602 606 RT_TRACE(_module_rtl871x_xmit_c_, _drv_info_, 603 - ("pattrib->encrypt =%d (WLAN_CIPHER_SUITE_CCMP)\n", 604 - pattrib->encrypt)); 607 + "pattrib->encrypt =%d (WLAN_CIPHER_SUITE_CCMP)\n", 608 + pattrib->encrypt); 605 609 pattrib->iv_len = IEEE80211_CCMP_HDR_LEN; 606 610 pattrib->icv_len = IEEE80211_CCMP_MIC_LEN; 607 611 break; ··· 613 617 } 614 618 615 619 RT_TRACE(_module_rtl871x_xmit_c_, _drv_info_, 616 - ("update_attrib: encrypt =%d\n", pattrib->encrypt)); 620 + "update_attrib: encrypt =%d\n", pattrib->encrypt); 617 621 618 622 if (pattrib->encrypt && !psecuritypriv->hw_decrypted) { 619 623 pattrib->bswenc = true; 620 624 RT_TRACE(_module_rtl871x_xmit_c_, _drv_err_, 621 - ("update_attrib: encrypt =%d bswenc = true\n", 622 - pattrib->encrypt)); 625 + "update_attrib: encrypt =%d bswenc = true\n", 626 + pattrib->encrypt); 623 627 } else { 624 628 pattrib->bswenc = false; 625 629 RT_TRACE(_module_rtl871x_xmit_c_, _drv_info_, 626 - ("update_attrib: bswenc = false\n")); 630 + "update_attrib: bswenc = false\n"); 627 631 } 628 632 update_attrib_phy_info(pattrib, psta); 629 633 ··· 722 726 curfragnum++) { 723 727 payload = PTR_ALIGN(payload, 4); 724 728 RT_TRACE(_module_rtl871x_xmit_c_, _drv_err_, 725 - ("=== curfragnum =%d, pframe = 0x%.2x, " 726 - "0x%.2x, 0x%.2x, 0x%.2x, 0x%.2x, 0x" 727 - "%.2x, 0x%.2x, 0x%.2x,!!!\n", 728 - curfragnum, *payload, *(payload + 1), 729 - *(payload + 2), *(payload + 3), 730 - *(payload + 4), *(payload + 5), 731 - *(payload + 6), *(payload + 7))); 729 + "=== curfragnum =%d, pframe = 0x%.2x, 0x%.2x, 0x%.2x, 0x%.2x, 0x%.2x, 0x%.2x, 0x%.2x, 0x%.2x,!!!\n", 730 + curfragnum, *payload, *(payload + 1), 731 + *(payload + 2), *(payload + 3), 732 + *(payload + 4), *(payload + 5), 733 + *(payload + 6), *(payload + 7)); 732 734 733 735 payload = payload + pattrib->hdrlen + 734 736 pattrib->iv_len; 735 737 RT_TRACE(_module_rtl871x_xmit_c_, _drv_err_, 736 - ("curfragnum =%d pattrib->hdrlen =%d " 737 - "pattrib->iv_len =%d", curfragnum, 738 - pattrib->hdrlen, pattrib->iv_len)); 738 + "curfragnum =%d pattrib->hdrlen =%d pattrib->iv_len =%d\n", 739 + curfragnum, 740 + pattrib->hdrlen, pattrib->iv_len); 739 741 if ((curfragnum + 1) == pattrib->nr_frags) { 740 742 length = pattrib->last_txcmdsz - 741 743 pattrib->hdrlen - ··· 755 761 pattrib->icv_len; 756 762 RT_TRACE(_module_rtl871x_xmit_c_, 757 763 _drv_err_, 758 - ("curfragnum =%d length =%d " 759 - "pattrib->icv_len =%d", 760 - curfragnum, length, 761 - pattrib->icv_len)); 764 + "curfragnum =%d length =%d pattrib->icv_len =%d\n", 765 + curfragnum, length, 766 + pattrib->icv_len); 762 767 } 763 768 } 764 769 rtw_secgetmic23a(&micdata, &mic[0]); 765 770 RT_TRACE(_module_rtl871x_xmit_c_, _drv_err_, 766 - ("xmitframe_addmic: before add mic code!!\n")); 771 + "xmitframe_addmic: before add mic code!!\n"); 767 772 RT_TRACE(_module_rtl871x_xmit_c_, _drv_err_, 768 - ("xmitframe_addmic: pattrib->last_txcmdsz =" 769 - "%d!!!\n", pattrib->last_txcmdsz)); 773 + "xmitframe_addmic: pattrib->last_txcmdsz =%d!!!\n", 774 + pattrib->last_txcmdsz); 770 775 RT_TRACE(_module_rtl871x_xmit_c_, _drv_err_, 771 - ("xmitframe_addmic: mic[0]= 0x%.2x , mic[1]=" 772 - "0x%.2x , mic[2]= 0x%.2x , mic[3]= 0x%.2x\n" 773 - "mic[4]= 0x%.2x , mic[5]= 0x%.2x , mic[6]= 0x%.2x " 774 - ", mic[7]= 0x%.2x !!!!\n", mic[0], mic[1], 775 - mic[2], mic[3], mic[4], mic[5], mic[6], 776 - mic[7])); 776 + "xmitframe_addmic: mic[0]= 0x%.2x , mic[1]=0x%.2x , mic[2]= 0x%.2x , mic[3]= 0x%.2x\nmic[4]= 0x%.2x , mic[5]= 0x%.2x , mic[6]= 0x%.2x , mic[7]= 0x%.2x !!!!\n", 777 + mic[0], mic[1], mic[2], mic[3], 778 + mic[4], mic[5], mic[6], mic[7]); 777 779 /* add mic code and add the mic code length 778 780 in last_txcmdsz */ 779 781 ··· 777 787 pattrib->last_txcmdsz += 8; 778 788 779 789 RT_TRACE(_module_rtl871x_xmit_c_, _drv_info_, 780 - ("\n ======== last pkt ========\n")); 790 + "======== last pkt ========\n"); 781 791 payload = payload - pattrib->last_txcmdsz + 8; 782 792 for (curfragnum = 0; curfragnum < pattrib->last_txcmdsz; 783 - curfragnum = curfragnum + 8) 793 + curfragnum = curfragnum + 8) { 784 794 RT_TRACE(_module_rtl871x_xmit_c_, _drv_info_, 785 - (" %.2x, %.2x, %.2x, %.2x, %.2x, " 786 - " %.2x, %.2x, %.2x ", 787 - *(payload + curfragnum), 788 - *(payload + curfragnum + 1), 789 - *(payload + curfragnum + 2), 790 - *(payload + curfragnum + 3), 791 - *(payload + curfragnum + 4), 792 - *(payload + curfragnum + 5), 793 - *(payload + curfragnum + 6), 794 - *(payload + curfragnum + 7))); 795 - } else { 796 - RT_TRACE(_module_rtl871x_xmit_c_, _drv_err_, 797 - ("xmitframe_addmic: rtw_get_stainfo23a ==" 798 - "NULL!!!\n")); 795 + "%.2x, %.2x, %.2x, %.2x, %.2x, %.2x, %.2x, %.2x\n", 796 + *(payload + curfragnum), 797 + *(payload + curfragnum + 1), 798 + *(payload + curfragnum + 2), 799 + *(payload + curfragnum + 3), 800 + *(payload + curfragnum + 4), 801 + *(payload + curfragnum + 5), 802 + *(payload + curfragnum + 6), 803 + *(payload + curfragnum + 7)); 804 + } 805 + } else { 806 + RT_TRACE(_module_rtl871x_xmit_c_, _drv_err_, 807 + "xmitframe_addmic: rtw_get_stainfo23a ==NULL!!!\n"); 799 808 } 800 809 } 801 810 ··· 810 821 if (pattrib->bswenc) { 811 822 /* DBG_8723A("start xmitframe_swencrypt\n"); */ 812 823 RT_TRACE(_module_rtl871x_xmit_c_, _drv_alert_, 813 - ("### xmitframe_swencrypt\n")); 824 + "### xmitframe_swencrypt\n"); 814 825 switch (pattrib->encrypt) { 815 826 case WLAN_CIPHER_SUITE_WEP40: 816 827 case WLAN_CIPHER_SUITE_WEP104: ··· 828 839 829 840 } else { 830 841 RT_TRACE(_module_rtl871x_xmit_c_, _drv_notice_, 831 - ("### xmitframe_hwencrypt\n")); 842 + "### xmitframe_hwencrypt\n"); 832 843 } 833 844 834 845 return _SUCCESS; ··· 905 916 qos_option = true; 906 917 } 907 918 else { 908 - RT_TRACE(_module_rtl871x_xmit_c_, _drv_err_, ("fw_state:%x is not allowed to xmit frame\n", get_fwstate(pmlmepriv))); 919 + RT_TRACE(_module_rtl871x_xmit_c_, _drv_err_, 920 + "fw_state:%x is not allowed to xmit frame\n", 921 + get_fwstate(pmlmepriv)); 909 922 res = _FAIL; 910 923 goto exit; 911 924 } ··· 1108 1117 1109 1118 if (rtw_make_wlanhdr(padapter, mem_start, pattrib) == _FAIL) { 1110 1119 RT_TRACE(_module_rtl871x_xmit_c_, _drv_err_, 1111 - ("%s: rtw_make_wlanhdr fail; drop pkt\n", __func__)); 1120 + "%s: rtw_make_wlanhdr fail; drop pkt\n", __func__); 1112 1121 res = _FAIL; 1113 1122 goto exit; 1114 1123 } ··· 1163 1172 memcpy(pframe, pattrib->iv, pattrib->iv_len); 1164 1173 1165 1174 RT_TRACE(_module_rtl871x_xmit_c_, _drv_notice_, 1166 - ("rtw_xmiaframe_coalesce23a: keyid =%d pattrib" 1167 - "->iv[3]=%.2x pframe =%.2x %.2x %.2x %.2x\n", 1168 - padapter->securitypriv.dot11PrivacyKeyIndex, 1169 - pattrib->iv[3], *pframe, *(pframe+1), 1170 - *(pframe+2), *(pframe+3))); 1175 + "rtw_xmiaframe_coalesce23a: keyid =%d pattrib->iv[3]=%.2x pframe =%.2x %.2x %.2x %.2x\n", 1176 + padapter->securitypriv.dot11PrivacyKeyIndex, 1177 + pattrib->iv[3], *pframe, *(pframe+1), 1178 + *(pframe+2), *(pframe+3)); 1171 1179 pframe += pattrib->iv_len; 1172 1180 mpdu_len -= pattrib->iv_len; 1173 1181 } ··· 1213 1223 break; 1214 1224 } else { 1215 1225 RT_TRACE(_module_rtl871x_xmit_c_, _drv_err_, 1216 - ("%s: There're still something in packet!\n", 1217 - __func__)); 1226 + "%s: There're still something in packet!\n", 1227 + __func__); 1218 1228 } 1219 1229 hdr->frame_control |= cpu_to_le16(IEEE80211_FCTL_MOREFRAGS); 1220 1230 ··· 1224 1234 1225 1235 if (xmitframe_addmic(padapter, pxmitframe) == _FAIL) { 1226 1236 RT_TRACE(_module_rtl871x_xmit_c_, _drv_err_, 1227 - ("xmitframe_addmic(padapter, pxmitframe) == _FAIL\n")); 1237 + "xmitframe_addmic(padapter, pxmitframe) == _FAIL\n"); 1228 1238 DBG_8723A("xmitframe_addmic(padapter, pxmitframe) == _FAIL\n"); 1229 1239 res = _FAIL; 1230 1240 goto exit; ··· 1452 1462 1453 1463 if (list_empty(&pfree_xmit_queue->queue)) { 1454 1464 RT_TRACE(_module_rtl871x_xmit_c_, _drv_info_, 1455 - ("rtw_alloc_xmitframe:%d\n", 1456 - pxmitpriv->free_xmitframe_cnt)); 1465 + "rtw_alloc_xmitframe:%d\n", 1466 + pxmitpriv->free_xmitframe_cnt); 1457 1467 pxframe = NULL; 1458 1468 } else { 1459 1469 phead = get_list_head(pfree_xmit_queue); ··· 1465 1475 list_del_init(&pxframe->list); 1466 1476 pxmitpriv->free_xmitframe_cnt--; 1467 1477 RT_TRACE(_module_rtl871x_xmit_c_, _drv_info_, 1468 - ("rtw_alloc_xmitframe():free_xmitframe_cnt =%d\n", 1469 - pxmitpriv->free_xmitframe_cnt)); 1478 + "rtw_alloc_xmitframe():free_xmitframe_cnt =%d\n", 1479 + pxmitpriv->free_xmitframe_cnt); 1470 1480 } 1471 1481 1472 1482 spin_unlock_bh(&pfree_xmit_queue->lock); ··· 1485 1495 spin_lock_bh(&queue->lock); 1486 1496 1487 1497 if (list_empty(&queue->queue)) { 1488 - RT_TRACE(_module_rtl871x_xmit_c_, _drv_info_, ("rtw_alloc_xmitframe23a_ext:%d\n", pxmitpriv->free_xframe_ext_cnt)); 1498 + RT_TRACE(_module_rtl871x_xmit_c_, _drv_info_, 1499 + "rtw_alloc_xmitframe23a_ext:%d\n", 1500 + pxmitpriv->free_xframe_ext_cnt); 1489 1501 pxframe = NULL; 1490 1502 } else { 1491 1503 phead = get_list_head(queue); ··· 1496 1504 1497 1505 list_del_init(&pxframe->list); 1498 1506 pxmitpriv->free_xframe_ext_cnt--; 1499 - RT_TRACE(_module_rtl871x_xmit_c_, _drv_info_, ("rtw_alloc_xmitframe23a_ext():free_xmitframe_cnt =%d\n", pxmitpriv->free_xframe_ext_cnt)); 1507 + RT_TRACE(_module_rtl871x_xmit_c_, _drv_info_, 1508 + "rtw_alloc_xmitframe23a_ext():free_xmitframe_cnt =%d\n", 1509 + pxmitpriv->free_xframe_ext_cnt); 1500 1510 } 1501 1511 1502 1512 spin_unlock_bh(&queue->lock); ··· 1515 1521 struct sk_buff *pndis_pkt = NULL; 1516 1522 1517 1523 if (pxmitframe == NULL) { 1518 - RT_TRACE(_module_rtl871x_xmit_c_, _drv_err_, ("====== rtw_free_xmitframe23a():pxmitframe == NULL!!!!!!!!!!\n")); 1524 + RT_TRACE(_module_rtl871x_xmit_c_, _drv_err_, 1525 + "====== rtw_free_xmitframe23a():pxmitframe == NULL!!!!!!!!!!\n"); 1519 1526 goto exit; 1520 1527 } 1521 1528 ··· 1538 1543 list_add_tail(&pxmitframe->list, get_list_head(queue)); 1539 1544 if (pxmitframe->ext_tag == 0) { 1540 1545 pxmitpriv->free_xmitframe_cnt++; 1541 - RT_TRACE(_module_rtl871x_xmit_c_, _drv_debug_, ("rtw_free_xmitframe23a():free_xmitframe_cnt =%d\n", pxmitpriv->free_xmitframe_cnt)); 1546 + RT_TRACE(_module_rtl871x_xmit_c_, _drv_debug_, 1547 + "rtw_free_xmitframe23a():free_xmitframe_cnt =%d\n", 1548 + pxmitpriv->free_xmitframe_cnt); 1542 1549 } else if (pxmitframe->ext_tag == 1) { 1543 1550 pxmitpriv->free_xframe_ext_cnt++; 1544 - RT_TRACE(_module_rtl871x_xmit_c_, _drv_debug_, ("rtw_free_xmitframe23a():free_xframe_ext_cnt =%d\n", pxmitpriv->free_xframe_ext_cnt)); 1551 + RT_TRACE(_module_rtl871x_xmit_c_, _drv_debug_, 1552 + "rtw_free_xmitframe23a():free_xframe_ext_cnt =%d\n", 1553 + pxmitpriv->free_xframe_ext_cnt); 1545 1554 } 1546 1555 1547 1556 spin_unlock_bh(&queue->lock); ··· 1584 1585 { 1585 1586 if (rtw_xmit23a_classifier(padapter, pxmitframe) == _FAIL) { 1586 1587 RT_TRACE(_module_rtl871x_xmit_c_, _drv_err_, 1587 - ("rtw_xmitframe_enqueue23a: drop xmit pkt for " 1588 - "classifier fail\n")); 1588 + "rtw_xmitframe_enqueue23a: drop xmit pkt for classifier fail\n"); 1589 1589 return _FAIL; 1590 1590 } 1591 1591 ··· 1673 1675 case 2: 1674 1676 ptxservq = &psta->sta_xmitpriv.bk_q; 1675 1677 *(ac) = 3; 1676 - RT_TRACE(_module_rtl871x_xmit_c_, _drv_info_, ("rtw_get_sta_pending23a : BK\n")); 1678 + RT_TRACE(_module_rtl871x_xmit_c_, _drv_info_, 1679 + "rtw_get_sta_pending23a : BK\n"); 1677 1680 break; 1678 1681 case 4: 1679 1682 case 5: 1680 1683 ptxservq = &psta->sta_xmitpriv.vi_q; 1681 1684 *(ac) = 1; 1682 - RT_TRACE(_module_rtl871x_xmit_c_, _drv_info_, ("rtw_get_sta_pending23a : VI\n")); 1685 + RT_TRACE(_module_rtl871x_xmit_c_, _drv_info_, 1686 + "rtw_get_sta_pending23a : VI\n"); 1683 1687 break; 1684 1688 case 6: 1685 1689 case 7: 1686 1690 ptxservq = &psta->sta_xmitpriv.vo_q; 1687 1691 *(ac) = 0; 1688 - RT_TRACE(_module_rtl871x_xmit_c_, _drv_info_, ("rtw_get_sta_pending23a : VO\n")); 1692 + RT_TRACE(_module_rtl871x_xmit_c_, _drv_info_, 1693 + "rtw_get_sta_pending23a : VO\n"); 1689 1694 break; 1690 1695 case 0: 1691 1696 case 3: 1692 1697 default: 1693 1698 ptxservq = &psta->sta_xmitpriv.be_q; 1694 1699 *(ac) = 2; 1695 - RT_TRACE(_module_rtl871x_xmit_c_, _drv_info_, ("rtw_get_sta_pending23a : BE\n")); 1700 + RT_TRACE(_module_rtl871x_xmit_c_, _drv_info_, 1701 + "rtw_get_sta_pending23a : BE\n"); 1696 1702 break; 1697 1703 } 1698 1704 return ptxservq; ··· 1727 1725 res = _FAIL; 1728 1726 DBG_8723A("rtw_xmit23a_classifier: psta == NULL\n"); 1729 1727 RT_TRACE(_module_rtl871x_xmit_c_, _drv_err_, 1730 - ("rtw_xmit23a_classifier: psta == NULL\n")); 1728 + "rtw_xmit23a_classifier: psta == NULL\n"); 1731 1729 goto exit; 1732 1730 } 1733 1731 if (!(psta->state & _FW_LINKED)) { ··· 1878 1876 1879 1877 if (pxmitframe == NULL) { 1880 1878 RT_TRACE(_module_xmit_osdep_c_, _drv_err_, 1881 - ("rtw_xmit23a: no more pxmitframe\n")); 1879 + "rtw_xmit23a: no more pxmitframe\n"); 1882 1880 return -1; 1883 1881 } 1884 1882 1885 1883 res = update_attrib(padapter, skb, &pxmitframe->attrib); 1886 1884 1887 1885 if (res == _FAIL) { 1888 - RT_TRACE(_module_xmit_osdep_c_, _drv_err_, ("rtw_xmit23a: update attrib fail\n")); 1886 + RT_TRACE(_module_xmit_osdep_c_, _drv_err_, 1887 + "rtw_xmit23a: update attrib fail\n"); 1889 1888 rtw_free_xmitframe23a(pxmitpriv, pxmitframe); 1890 1889 return -1; 1891 1890 }
+15 -23
drivers/staging/rtl8723au/hal/HalPwrSeqCmd.c
··· 59 59 PwrCfgCmd = PwrSeqCmd[AryIdx]; 60 60 61 61 RT_TRACE(_module_hal_init_c_, _drv_info_, 62 - ("HalPwrSeqCmdParsing23a: offset(%#x) cut_msk(%#x) " 63 - "fab_msk(%#x) interface_msk(%#x) base(%#x) cmd(%#x) " 64 - "msk(%#x) value(%#x)\n", 65 - GET_PWR_CFG_OFFSET(PwrCfgCmd), 66 - GET_PWR_CFG_CUT_MASK(PwrCfgCmd), 67 - GET_PWR_CFG_FAB_MASK(PwrCfgCmd), 68 - GET_PWR_CFG_INTF_MASK(PwrCfgCmd), 69 - GET_PWR_CFG_BASE(PwrCfgCmd), 70 - GET_PWR_CFG_CMD(PwrCfgCmd), 71 - GET_PWR_CFG_MASK(PwrCfgCmd), 72 - GET_PWR_CFG_VALUE(PwrCfgCmd))); 62 + "HalPwrSeqCmdParsing23a: offset(%#x) cut_msk(%#x) fab_msk(%#x) interface_msk(%#x) base(%#x) cmd(%#x) msk(%#x) value(%#x)\n", 63 + GET_PWR_CFG_OFFSET(PwrCfgCmd), 64 + GET_PWR_CFG_CUT_MASK(PwrCfgCmd), 65 + GET_PWR_CFG_FAB_MASK(PwrCfgCmd), 66 + GET_PWR_CFG_INTF_MASK(PwrCfgCmd), 67 + GET_PWR_CFG_BASE(PwrCfgCmd), 68 + GET_PWR_CFG_CMD(PwrCfgCmd), 69 + GET_PWR_CFG_MASK(PwrCfgCmd), 70 + GET_PWR_CFG_VALUE(PwrCfgCmd)); 73 71 74 72 /* 2 Only Handle the command whose FAB, CUT, and Interface are 75 73 matched */ ··· 77 79 switch (GET_PWR_CFG_CMD(PwrCfgCmd)) { 78 80 case PWR_CMD_READ: 79 81 RT_TRACE(_module_hal_init_c_, _drv_info_, 80 - ("HalPwrSeqCmdParsing23a: " 81 - "PWR_CMD_READ\n")); 82 + "HalPwrSeqCmdParsing23a: PWR_CMD_READ\n"); 82 83 break; 83 84 84 85 case PWR_CMD_WRITE: 85 86 RT_TRACE(_module_hal_init_c_, _drv_info_, 86 - ("HalPwrSeqCmdParsing23a: " 87 - "PWR_CMD_WRITE\n")); 87 + "HalPwrSeqCmdParsing23a: PWR_CMD_WRITE\n"); 88 88 offset = GET_PWR_CFG_OFFSET(PwrCfgCmd); 89 89 90 90 /* Read the value from system register */ ··· 98 102 99 103 case PWR_CMD_POLLING: 100 104 RT_TRACE(_module_hal_init_c_, _drv_info_, 101 - ("HalPwrSeqCmdParsing23a: " 102 - "PWR_CMD_POLLING\n")); 105 + "HalPwrSeqCmdParsing23a: PWR_CMD_POLLING\n"); 103 106 104 107 bPollingBit = false; 105 108 offset = GET_PWR_CFG_OFFSET(PwrCfgCmd); ··· 126 131 127 132 case PWR_CMD_DELAY: 128 133 RT_TRACE(_module_hal_init_c_, _drv_info_, 129 - ("HalPwrSeqCmdParsing23a: " 130 - "PWR_CMD_DELAY\n")); 134 + "HalPwrSeqCmdParsing23a: PWR_CMD_DELAY\n"); 131 135 if (GET_PWR_CFG_VALUE(PwrCfgCmd) == 132 136 PWRSEQ_DELAY_US) 133 137 udelay(GET_PWR_CFG_OFFSET(PwrCfgCmd)); ··· 139 145 /* When this command is parsed, end 140 146 the process */ 141 147 RT_TRACE(_module_hal_init_c_, _drv_info_, 142 - ("HalPwrSeqCmdParsing23a: " 143 - "PWR_CMD_END\n")); 148 + "HalPwrSeqCmdParsing23a: PWR_CMD_END\n"); 144 149 return true; 145 150 146 151 default: 147 152 RT_TRACE(_module_hal_init_c_, _drv_err_, 148 - ("HalPwrSeqCmdParsing23a: " 149 - "Unknown CMD!!\n")); 153 + "HalPwrSeqCmdParsing23a: Unknown CMD!!\n"); 150 154 break; 151 155 } 152 156 }
-12
drivers/staging/rtl8723au/hal/hal_com.c
··· 395 395 if (MinSpacingToSet < SecMinSpace) 396 396 MinSpacingToSet = SecMinSpace; 397 397 398 - /* RT_TRACE(COMP_MLME, DBG_LOUD, 399 - ("Set HW_VAR_AMPDU_MIN_SPACE: %#x\n", 400 - padapter->MgntInfo.MinSpaceCfg)); */ 401 398 MinSpacingToSet |= 402 399 rtl8723au_read8(padapter, REG_AMPDU_MIN_SPACE) & 0xf8; 403 400 rtl8723au_write8(padapter, REG_AMPDU_MIN_SPACE, ··· 434 437 rtl8723au_write8(padapter, REG_AGGLEN_LMT + index, 435 438 pRegToSet[index]); 436 439 } 437 - 438 - /* RT_TRACE(COMP_MLME, DBG_LOUD, 439 - ("Set HW_VAR_AMPDU_FACTOR: %#x\n", FactorToSet)); */ 440 440 } 441 441 } 442 442 ··· 618 624 /* write content 0 is equall to mark invalid */ 619 625 /* delay_ms(40); */ 620 626 rtl8723au_write32(padapter, WCAMI, ulContent); 621 - /* RT_TRACE(COMP_SEC, DBG_LOUD, 622 - ("rtl8723a_cam_empty_entry(): WRITE A4: %lx\n", 623 - ulContent));*/ 624 627 /* delay_ms(40); */ 625 628 rtl8723au_write32(padapter, REG_CAMCMD, ulCommand); 626 - /* RT_TRACE(COMP_SEC, DBG_LOUD, 627 - ("rtl8723a_cam_empty_entry(): WRITE A0: %lx\n", 628 - ulCommand));*/ 629 629 } 630 630 } 631 631
+15
drivers/staging/rtl8723au/hal/odm_debug.c
··· 22 22 } 23 23 24 24 u32 GlobalDebugLevel23A; 25 + 26 + void rt_trace(int comp, int level, const char *fmt, ...) 27 + { 28 + struct va_format vaf; 29 + va_list args; 30 + 31 + va_start(args, fmt); 32 + 33 + vaf.fmt = fmt; 34 + vaf.va = &args; 35 + 36 + pr_info(DRIVER_PREFIX " [0x%08x,%d] %pV", comp, level, &vaf); 37 + 38 + va_end(args); 39 + }
+11 -8
drivers/staging/rtl8723au/hal/rtl8723a_bt-coexist.c
··· 1554 1554 pBtSec->bUsedHwEncrypt = true; 1555 1555 else 1556 1556 pBtSec->bUsedHwEncrypt = false; 1557 - RT_TRACE(_module_rtl871x_security_c_, _drv_info_, ("%s: bUsedHwEncrypt =%d\n", __func__, pBtSec->bUsedHwEncrypt)); 1557 + RT_TRACE(_module_rtl871x_security_c_, _drv_info_, 1558 + "%s: bUsedHwEncrypt =%d\n", __func__, pBtSec->bUsedHwEncrypt); 1558 1559 1559 1560 pBtSec->RSNIE.Octet = pBtSec->RSNIEBuf; 1560 1561 } ··· 4519 4518 RTPRINT(FIOCTL, IOCTL_STATE, ("STATE_CMD_MAC_CONNECT_COMPLETE\n")); 4520 4519 4521 4520 if (pBTInfo->BtAsocEntry[EntryNum].AMPRole == AMP_BTAP_JOINER) { 4522 - RT_TRACE(_module_rtl871x_security_c_, 4523 - _drv_info_, ("StateConnecting \n")); 4521 + RT_TRACE(_module_rtl871x_security_c_, _drv_info_, 4522 + "StateConnecting\n"); 4524 4523 } 4525 4524 break; 4526 4525 case STATE_CMD_DISCONNECT_PHY_LINK: ··· 11197 11196 pHalData->bt_coexist.bt_radiosharedtype = pHalData->EEPROMBluetoothRadioShared; 11198 11197 11199 11198 RT_TRACE(_module_hal_init_c_, _drv_info_, 11200 - ("BT Coexistance = 0x%x\n", rtl8723a_BT_coexist(padapter))); 11199 + "BT Coexistance = 0x%x\n", rtl8723a_BT_coexist(padapter)); 11201 11200 11202 11201 if (rtl8723a_BT_coexist(padapter)) { 11203 11202 if (pHalData->bt_coexist.BT_Ant_Num == Ant_x2) { 11204 11203 BTDM_SetBtCoexCurrAntNum(padapter, 2); 11205 - RT_TRACE(_module_hal_init_c_, _drv_info_, ("BlueTooth BT_Ant_Num = Antx2\n")); 11204 + RT_TRACE(_module_hal_init_c_, _drv_info_, 11205 + "BlueTooth BT_Ant_Num = Antx2\n"); 11206 11206 } else if (pHalData->bt_coexist.BT_Ant_Num == Ant_x1) { 11207 11207 BTDM_SetBtCoexCurrAntNum(padapter, 1); 11208 - RT_TRACE(_module_hal_init_c_, _drv_info_, ("BlueTooth BT_Ant_Num = Antx1\n")); 11208 + RT_TRACE(_module_hal_init_c_, _drv_info_, 11209 + "BlueTooth BT_Ant_Num = Antx1\n"); 11209 11210 } 11210 11211 pHalData->bt_coexist.bBTBusyTraffic = false; 11211 11212 pHalData->bt_coexist.bBTTrafficModeSet = false; ··· 11216 11213 pHalData->bt_coexist.PreviousState = 0; 11217 11214 11218 11215 RT_TRACE(_module_hal_init_c_, _drv_info_, 11219 - ("bt_radiosharedType = 0x%x\n", 11220 - pHalData->bt_coexist.bt_radiosharedtype)); 11216 + "bt_radiosharedType = 0x%x\n", 11217 + pHalData->bt_coexist.bt_radiosharedtype); 11221 11218 } 11222 11219 } 11223 11220
+57 -67
drivers/staging/rtl8723au/hal/rtl8723a_hal_init.c
··· 95 95 goto exit; 96 96 } 97 97 RT_TRACE(_module_hal_init_c_, _drv_info_, 98 - ("_WriteFW Done- for Normal chip.\n")); 98 + "_WriteFW Done- for Normal chip.\n"); 99 99 100 100 exit: 101 101 return ret; ··· 115 115 116 116 if (counter >= POLLING_READY_TIMEOUT_COUNT) { 117 117 RT_TRACE(_module_hal_init_c_, _drv_err_, 118 - ("%s: chksum report fail! REG_MCUFWDL:0x%08x\n", 119 - __func__, value32)); 118 + "%s: chksum report fail! REG_MCUFWDL:0x%08x\n", 119 + __func__, value32); 120 120 return _FAIL; 121 121 } 122 122 RT_TRACE(_module_hal_init_c_, _drv_info_, 123 - ("%s: Checksum report OK! REG_MCUFWDL:0x%08x\n", __func__, 124 - value32)); 123 + "%s: Checksum report OK! REG_MCUFWDL:0x%08x\n", __func__, 124 + value32); 125 125 126 126 value32 = rtl8723au_read32(padapter, REG_MCUFWDL); 127 127 value32 |= MCUFWDL_RDY; ··· 134 134 value32 = rtl8723au_read32(padapter, REG_MCUFWDL); 135 135 if (value32 & WINTINI_RDY) { 136 136 RT_TRACE(_module_hal_init_c_, _drv_info_, 137 - ("%s: Polling FW ready success!! " 138 - "REG_MCUFWDL:0x%08x\n", 139 - __func__, value32)); 137 + "%s: Polling FW ready success!! REG_MCUFWDL:0x%08x\n", 138 + __func__, value32); 140 139 return _SUCCESS; 141 140 } 142 141 udelay(5); 143 142 } while (counter++ < POLLING_READY_TIMEOUT_COUNT); 144 143 145 144 RT_TRACE(_module_hal_init_c_, _drv_err_, 146 - ("%s: Polling FW ready fail!! REG_MCUFWDL:0x%08x\n", 147 - __func__, value32)); 145 + "%s: Polling FW ready fail!! REG_MCUFWDL:0x%08x\n", 146 + __func__, value32); 148 147 return _FAIL; 149 148 } 150 149 ··· 172 173 u1bTmp = rtl8723au_read8(padapter, REG_SYS_FUNC_EN + 1); 173 174 } 174 175 RT_TRACE(_module_hal_init_c_, _drv_info_, 175 - ("-%s: 8051 reset success (%d)\n", __func__, 176 - Delay)); 176 + "-%s: 8051 reset success (%d)\n", __func__, 177 + Delay); 177 178 178 179 if ((Delay == 0)) { 179 180 /* force firmware reset */ ··· 205 206 int fw_size; 206 207 static int log_version; 207 208 208 - RT_TRACE(_module_hal_init_c_, _drv_info_, ("+%s\n", __func__)); 209 + RT_TRACE(_module_hal_init_c_, _drv_info_, "+%s\n", __func__); 209 210 210 211 if (IS_8723A_A_CUT(pHalData->VersionID)) { 211 212 fw_name = "rtlwifi/rtl8723aufw_A.bin"; 212 213 RT_TRACE(_module_hal_init_c_, _drv_info_, 213 - ("rtl8723a_FirmwareDownload: R8723FwImageArray_UMC " 214 - "for RTL8723A A CUT\n")); 214 + "rtl8723a_FirmwareDownload: R8723FwImageArray_UMC for RTL8723A A CUT\n"); 215 215 } else if (IS_8723A_B_CUT(pHalData->VersionID)) { 216 216 /* WLAN Fw. */ 217 217 if (padapter->registrypriv.wifi_spec == 1) { ··· 232 234 /* <Roger_TODO> We should download proper RAM Code here 233 235 to match the ROM code. */ 234 236 RT_TRACE(_module_hal_init_c_, _drv_err_, 235 - ("%s: unknow version!\n", __func__)); 237 + "%s: unknown version!\n", __func__); 236 238 rtStatus = _FAIL; 237 239 goto Exit; 238 240 } ··· 317 319 rtStatus = _FWFreeToGo(padapter); 318 320 if (_SUCCESS != rtStatus) { 319 321 RT_TRACE(_module_hal_init_c_, _drv_err_, 320 - ("DL Firmware failed!\n")); 322 + "DL Firmware failed!\n"); 321 323 goto Exit; 322 324 } 323 325 RT_TRACE(_module_hal_init_c_, _drv_info_, 324 - ("Firmware is ready to run!\n")); 326 + "Firmware is ready to run!\n"); 325 327 326 328 Exit: 327 329 kfree(firmware_buf); ··· 817 819 we record the value */ 818 820 /* which should be read from register to a global variable. */ 819 821 820 - RT_TRACE(_module_hci_hal_init_c_, _drv_info_, ("+ResumeTxBeacon\n")); 822 + RT_TRACE(_module_hci_hal_init_c_, _drv_info_, "+ResumeTxBeacon\n"); 821 823 822 824 pHalData->RegFwHwTxQCtrl |= BIT(6); 823 825 rtl8723au_write8(padapter, REG_FWHW_TXQ_CTRL + 2, ··· 835 837 we record the value */ 836 838 /* which should be read from register to a global variable. */ 837 839 838 - RT_TRACE(_module_hci_hal_init_c_, _drv_info_, ("+StopTxBeacon\n")); 840 + RT_TRACE(_module_hci_hal_init_c_, _drv_info_, "+StopTxBeacon\n"); 839 841 840 842 pHalData->RegFwHwTxQCtrl &= ~BIT(6); 841 843 rtl8723au_write8(padapter, REG_FWHW_TXQ_CTRL + 2, ··· 981 983 switch (c2h_evt->id) { 982 984 case C2H_DBG: 983 985 RT_TRACE(_module_hal_init_c_, _drv_info_, 984 - ("C2HCommandHandler: %s\n", c2h_evt->payload)); 986 + "C2HCommandHandler: %s\n", c2h_evt->payload); 985 987 break; 986 988 987 989 case C2H_CCX_TX_RPT: ··· 991 993 break; 992 994 case C2H_HW_INFO_EXCH: 993 995 RT_TRACE(_module_hal_init_c_, _drv_info_, 994 - ("[BT], C2H_HW_INFO_EXCH\n")); 996 + "[BT], C2H_HW_INFO_EXCH\n"); 995 997 for (i = 0; i < c2h_evt->plen; i++) { 996 998 RT_TRACE(_module_hal_init_c_, _drv_info_, 997 - ("[BT], tmpBuf[%d]= 0x%x\n", i, 998 - c2h_evt->payload[i])); 999 + "[BT], tmpBuf[%d]= 0x%x\n", i, 1000 + c2h_evt->payload[i]); 999 1001 } 1000 1002 break; 1001 1003 1002 1004 case C2H_C2H_H2C_TEST: 1003 1005 RT_TRACE(_module_hal_init_c_, _drv_info_, 1004 - ("[BT], C2H_H2C_TEST\n")); 1006 + "[BT], C2H_H2C_TEST\n"); 1005 1007 RT_TRACE(_module_hal_init_c_, _drv_info_, 1006 - ("[BT], tmpBuf[0]/[1]/[2]/[3]/[4]= 0x%x/ 0x%x/ " 1007 - "0x%x/ 0x%x/ 0x%x\n", c2h_evt->payload[0], 1008 - c2h_evt->payload[1], c2h_evt->payload[2], 1009 - c2h_evt->payload[3], c2h_evt->payload[4])); 1008 + "[BT], tmpBuf[0]/[1]/[2]/[3]/[4]= 0x%x/ 0x%x/ 0x%x/ 0x%x/ 0x%x\n", 1009 + c2h_evt->payload[0], 1010 + c2h_evt->payload[1], c2h_evt->payload[2], 1011 + c2h_evt->payload[3], c2h_evt->payload[4]); 1010 1012 break; 1011 1013 1012 1014 case C2H_BT_INFO: ··· 1139 1141 1140 1142 if (count > POLLING_LLT_THRESHOLD) { 1141 1143 RT_TRACE(_module_hal_init_c_, _drv_err_, 1142 - ("Failed to polling write LLT done at " 1143 - "address %d!\n", address)); 1144 + "Failed to polling write LLT done at address %d!\n", 1145 + address); 1144 1146 status = _FAIL; 1145 1147 break; 1146 1148 } ··· 1252 1254 1253 1255 /* 2010/08/12 MH We need to set BB/GLBAL reset to save power 1254 1256 for SS mode. */ 1255 - 1256 - /* RT_TRACE(COMP_INIT, DBG_LOUD, ("======> RF off and reset BB.\n")); */ 1257 1257 } 1258 1258 1259 1259 static void _ResetDigitalProcedure1_92C(struct rtw_adapter *padapter, ··· 1380 1384 value8 = rtl8723au_read8(padapter, REG_LDOV12D_CTRL); 1381 1385 value8 &= ~LDV12_EN; 1382 1386 rtl8723au_write8(padapter, REG_LDOV12D_CTRL, value8); 1383 - /* RT_TRACE(COMP_INIT, DBG_LOUD, 1384 - (" REG_LDOV12D_CTRL Reg0x21:0x%02x.\n", value8)); */ 1385 1387 } 1386 1388 1387 1389 /***************************** ··· 1427 1433 _DisableAnalog(padapter, false); 1428 1434 1429 1435 RT_TRACE(_module_hci_hal_init_c_, _drv_info_, 1430 - ("======> Card disable finished.\n")); 1436 + "======> Card disable finished.\n"); 1431 1437 1432 1438 return _SUCCESS; 1433 1439 } ··· 1453 1459 /* ==== Disable analog sequence === */ 1454 1460 _DisableAnalog(padapter, true); 1455 1461 1456 - /* RT_TRACE(COMP_INIT, DBG_LOUD, 1457 - ("<====== Card Disable Without HWSM .\n")); */ 1458 1462 return _SUCCESS; 1459 1463 } 1460 1464 ··· 1469 1477 } 1470 1478 } else { 1471 1479 RT_TRACE(_module_hci_hal_init_c_, _drv_notice_, 1472 - ("AutoLoad Fail reported from CR9346!!\n")); 1480 + "AutoLoad Fail reported from CR9346!!\n"); 1473 1481 /* update to default value 0xFF */ 1474 1482 if (!pEEPROM->EepromOrEfuse) 1475 1483 EFUSE_ShadowMapUpdate23a(padapter, EFUSE_WIFI); ··· 1494 1502 } 1495 1503 1496 1504 RT_TRACE(_module_hal_init_c_, _drv_info_, 1497 - ("EEPROM ID = 0x%04x\n", EEPROMId)); 1505 + "EEPROM ID = 0x%04x\n", EEPROMId); 1498 1506 } 1499 1507 1500 1508 static void Hal_EEValueCheck(u8 EEType, void *pInValue, void *pOutValue) ··· 1509 1517 *pOut = *pIn; 1510 1518 else { 1511 1519 RT_TRACE(_module_hci_hal_init_c_, _drv_err_, 1512 - ("EETYPE_TX_PWR, value =%d is invalid, set " 1513 - "to default = 0x%x\n", 1514 - *pIn, EEPROM_Default_TxPowerLevel)); 1520 + "EETYPE_TX_PWR, value =%d is invalid, set to default = 0x%x\n", 1521 + *pIn, EEPROM_Default_TxPowerLevel); 1515 1522 *pOut = EEPROM_Default_TxPowerLevel; 1516 1523 } 1517 1524 } ··· 1648 1657 for (rfPath = 0; rfPath < RF_PATH_MAX; rfPath++) { 1649 1658 for (ch = 0; ch < CHANNEL_MAX_NUMBER; ch++) { 1650 1659 RT_TRACE(_module_hci_hal_init_c_, _drv_info_, 1651 - ("RF(%u)-Ch(%u) [CCK / HT40_1S / HT40_2S] = " 1652 - "[0x%x / 0x%x / 0x%x]\n", 1653 - rfPath, ch, 1654 - pHalData->TxPwrLevelCck[rfPath][ch], 1655 - pHalData->TxPwrLevelHT40_1S[rfPath][ch], 1656 - pHalData->TxPwrLevelHT40_2S[rfPath][ch])); 1660 + "RF(%u)-Ch(%u) [CCK / HT40_1S / HT40_2S] = [0x%x / 0x%x / 0x%x]\n", 1661 + rfPath, ch, 1662 + pHalData->TxPwrLevelCck[rfPath][ch], 1663 + pHalData->TxPwrLevelHT40_1S[rfPath][ch], 1664 + pHalData->TxPwrLevelHT40_2S[rfPath][ch]); 1657 1665 1658 1666 } 1659 1667 } 1660 1668 for (ch = 0; ch < CHANNEL_MAX_NUMBER; ch++) { 1661 1669 RT_TRACE(_module_hci_hal_init_c_, _drv_info_, 1662 - ("RF-A Ht20 to HT40 Diff[%u] = 0x%x(%d)\n", ch, 1663 - pHalData->TxPwrHt20Diff[RF_PATH_A][ch], 1664 - pHalData->TxPwrHt20Diff[RF_PATH_A][ch])); 1670 + "RF-A Ht20 to HT40 Diff[%u] = 0x%x(%d)\n", ch, 1671 + pHalData->TxPwrHt20Diff[RF_PATH_A][ch], 1672 + pHalData->TxPwrHt20Diff[RF_PATH_A][ch]); 1665 1673 } 1666 1674 for (ch = 0; ch < CHANNEL_MAX_NUMBER; ch++) 1667 1675 RT_TRACE(_module_hci_hal_init_c_, _drv_info_, 1668 - ("RF-A Legacy to Ht40 Diff[%u] = 0x%x\n", ch, 1669 - pHalData->TxPwrLegacyHtDiff[RF_PATH_A][ch])); 1676 + "RF-A Legacy to Ht40 Diff[%u] = 0x%x\n", ch, 1677 + pHalData->TxPwrLegacyHtDiff[RF_PATH_A][ch]); 1670 1678 for (ch = 0; ch < CHANNEL_MAX_NUMBER; ch++) { 1671 1679 RT_TRACE(_module_hci_hal_init_c_, _drv_info_, 1672 - ("RF-B Ht20 to HT40 Diff[%u] = 0x%x(%d)\n", ch, 1673 - pHalData->TxPwrHt20Diff[RF_PATH_B][ch], 1674 - pHalData->TxPwrHt20Diff[RF_PATH_B][ch])); 1680 + "RF-B Ht20 to HT40 Diff[%u] = 0x%x(%d)\n", ch, 1681 + pHalData->TxPwrHt20Diff[RF_PATH_B][ch], 1682 + pHalData->TxPwrHt20Diff[RF_PATH_B][ch]); 1675 1683 } 1676 1684 for (ch = 0; ch < CHANNEL_MAX_NUMBER; ch++) 1677 1685 RT_TRACE(_module_hci_hal_init_c_, _drv_info_, 1678 - ("RF-B Legacy to HT40 Diff[%u] = 0x%x\n", ch, 1679 - pHalData->TxPwrLegacyHtDiff[RF_PATH_B][ch])); 1686 + "RF-B Legacy to HT40 Diff[%u] = 0x%x\n", ch, 1687 + pHalData->TxPwrLegacyHtDiff[RF_PATH_B][ch]); 1680 1688 if (!AutoLoadFail) { 1681 1689 struct registry_priv *registry_par = &padapter->registrypriv; 1682 1690 if (registry_par->regulatory_tid == 0xff) { ··· 1692 1702 pHalData->EEPROMRegulatory = 0; 1693 1703 } 1694 1704 RT_TRACE(_module_hci_hal_init_c_, _drv_info_, 1695 - ("EEPROMRegulatory = 0x%x\n", pHalData->EEPROMRegulatory)); 1705 + "EEPROMRegulatory = 0x%x\n", pHalData->EEPROMRegulatory); 1696 1706 1697 1707 if (!AutoLoadFail) 1698 1708 pHalData->bTXPowerDataReadFromEEPORM = true; ··· 1742 1752 else 1743 1753 pHalData->EEPROMVersion = 1; 1744 1754 RT_TRACE(_module_hci_hal_init_c_, _drv_info_, 1745 - ("Hal_EfuseParseEEPROMVer(), EEVer = %d\n", 1746 - pHalData->EEPROMVersion)); 1755 + "Hal_EfuseParseEEPROMVer(), EEVer = %d\n", 1756 + pHalData->EEPROMVersion); 1747 1757 } 1748 1758 1749 1759 void ··· 1776 1786 pHalData->EEPROMSubCustomerID = 0; 1777 1787 } 1778 1788 RT_TRACE(_module_hci_hal_init_c_, _drv_info_, 1779 - ("EEPROM Customer ID: 0x%2x\n", pHalData->EEPROMCustomerID)); 1789 + "EEPROM Customer ID: 0x%2x\n", pHalData->EEPROMCustomerID); 1780 1790 RT_TRACE(_module_hci_hal_init_c_, _drv_info_, 1781 - ("EEPROM SubCustomer ID: 0x%02x\n", 1782 - pHalData->EEPROMSubCustomerID)); 1791 + "EEPROM SubCustomer ID: 0x%02x\n", 1792 + pHalData->EEPROMSubCustomerID); 1783 1793 } 1784 1794 1785 1795 void ··· 1808 1818 pHalData->CrystalCap = EEPROM_Default_CrystalCap_8723A; 1809 1819 } 1810 1820 RT_TRACE(_module_hci_hal_init_c_, _drv_info_, 1811 - ("%s: CrystalCap = 0x%2x\n", __func__, 1812 - pHalData->CrystalCap)); 1821 + "%s: CrystalCap = 0x%2x\n", __func__, 1822 + pHalData->CrystalCap); 1813 1823 } 1814 1824 1815 1825 void
+1 -92
drivers/staging/rtl8723au/hal/rtl8723a_phycfg.c
··· 121 121 { 122 122 u32 OriginalValue, BitShift; 123 123 124 - /* RT_TRACE(COMP_RF, DBG_TRACE, ("--->PHY_SetBBReg(): RegAddr(%#lx), BitMask(%#lx), Data(%#lx)\n", RegAddr, BitMask, Data)); */ 125 - 126 124 if (BitMask != bMaskDWord) {/* if not "double word" write */ 127 125 OriginalValue = rtl8723au_read32(Adapter, RegAddr); 128 126 BitShift = phy_CalculateBitShift(BitMask); ··· 130 132 rtl8723au_write32(Adapter, RegAddr, Data); 131 133 132 134 /* RTPRINT(FPHY, PHY_BBW, ("BBW MASK = 0x%lx Addr[0x%lx]= 0x%lx\n", BitMask, RegAddr, Data)); */ 133 - /* RT_TRACE(COMP_RF, DBG_TRACE, ("<---PHY_SetBBReg(): RegAddr(%#lx), BitMask(%#lx), Data(%#lx)\n", RegAddr, BitMask, Data)); */ 134 135 } 135 136 136 137 /* */ ··· 545 548 546 549 if (RegAddr == rTxAGC_A_Rate18_06) { 547 550 pHalData->MCSTxPowerLevelOriginalOffset[pHalData->pwrGroupCnt][0] = Data; 548 - /* RT_TRACE(COMP_INIT, DBG_TRACE, 549 - ("MCSTxPowerLevelOriginalOffset[%d][0] = 0x%lx\n", 550 - pHalData->pwrGroupCnt, */ 551 - /* pHalData->MCSTxPowerLevelOriginalOffset[ 552 - pHalData->pwrGroupCnt][0])); */ 553 551 } 554 552 if (RegAddr == rTxAGC_A_Rate54_24) { 555 553 pHalData->MCSTxPowerLevelOriginalOffset[pHalData->pwrGroupCnt][1] = Data; 556 - /* RT_TRACE(COMP_INIT, DBG_TRACE, 557 - ("MCSTxPowerLevelOriginalOffset[%d][1] = 0x%lx\n", 558 - pHalData->pwrGroupCnt, */ 559 - /* pHalData->MCSTxPowerLevelOriginalOffset[ 560 - pHalData->pwrGroupCnt][1])); */ 561 554 } 562 555 if (RegAddr == rTxAGC_A_CCK1_Mcs32) { 563 556 pHalData->MCSTxPowerLevelOriginalOffset[pHalData->pwrGroupCnt][6] = Data; 564 - /* RT_TRACE(COMP_INIT, DBG_TRACE, 565 - ("MCSTxPowerLevelOriginalOffset[%d][6] = 0x%lx\n", 566 - pHalData->pwrGroupCnt, */ 567 - /* pHalData->MCSTxPowerLevelOriginalOffset[ 568 - pHalData->pwrGroupCnt][6])); */ 569 557 } 570 558 if (RegAddr == rTxAGC_B_CCK11_A_CCK2_11 && BitMask == 0xffffff00) { 571 559 pHalData->MCSTxPowerLevelOriginalOffset[pHalData->pwrGroupCnt][7] = Data; 572 - /* RT_TRACE(COMP_INIT, DBG_TRACE, 573 - ("MCSTxPowerLevelOriginalOffset[%d][7] = 0x%lx\n", 574 - pHalData->pwrGroupCnt, */ 575 - /* pHalData->MCSTxPowerLevelOriginalOffset[ 576 - pHalData->pwrGroupCnt][7])); */ 577 560 } 578 561 if (RegAddr == rTxAGC_A_Mcs03_Mcs00) { 579 562 pHalData->MCSTxPowerLevelOriginalOffset[pHalData->pwrGroupCnt][2] = Data; 580 - /* RT_TRACE(COMP_INIT, DBG_TRACE, 581 - ("MCSTxPowerLevelOriginalOffset[%d][2] = 0x%lx\n", 582 - pHalData->pwrGroupCnt, */ 583 - /* pHalData->MCSTxPowerLevelOriginalOffset[ 584 - pHalData->pwrGroupCnt][2])); */ 585 563 } 586 564 if (RegAddr == rTxAGC_A_Mcs07_Mcs04) { 587 565 pHalData->MCSTxPowerLevelOriginalOffset[pHalData->pwrGroupCnt][3] = Data; 588 - /* RT_TRACE(COMP_INIT, DBG_TRACE, 589 - ("MCSTxPowerLevelOriginalOffset[%d][3] = 0x%lx\n", 590 - pHalData->pwrGroupCnt, */ 591 - /* pHalData->MCSTxPowerLevelOriginalOffset[ 592 - pHalData->pwrGroupCnt][3])); */ 593 566 } 594 567 if (RegAddr == rTxAGC_A_Mcs11_Mcs08) { 595 568 pHalData->MCSTxPowerLevelOriginalOffset[pHalData->pwrGroupCnt][4] = Data; 596 - /* RT_TRACE(COMP_INIT, DBG_TRACE, 597 - ("MCSTxPowerLevelOriginalOffset[%d][4] = 0x%lx\n", 598 - pHalData->pwrGroupCnt, */ 599 - /* pHalData->MCSTxPowerLevelOriginalOffset[ 600 - pHalData->pwrGroupCnt][4])); */ 601 569 } 602 570 if (RegAddr == rTxAGC_A_Mcs15_Mcs12) { 603 571 pHalData->MCSTxPowerLevelOriginalOffset[pHalData->pwrGroupCnt][5] = Data; 604 - /* RT_TRACE(COMP_INIT, DBG_TRACE, 605 - ("MCSTxPowerLevelOriginalOffset[%d][5] = 0x%lx\n", 606 - pHalData->pwrGroupCnt, */ 607 - /* pHalData->MCSTxPowerLevelOriginalOffset[ 608 - pHalData->pwrGroupCnt][5])); */ 609 572 } 610 573 if (RegAddr == rTxAGC_B_Rate18_06) { 611 574 pHalData->MCSTxPowerLevelOriginalOffset[pHalData->pwrGroupCnt][8] = Data; 612 - /* RT_TRACE(COMP_INIT, DBG_TRACE, 613 - ("MCSTxPowerLevelOriginalOffset[%d][8] = 0x%lx\n", 614 - pHalData->pwrGroupCnt, */ 615 - /* pHalData->MCSTxPowerLevelOriginalOffset[ 616 - pHalData->pwrGroupCnt][8])); */ 617 575 } 618 576 if (RegAddr == rTxAGC_B_Rate54_24) { 619 577 pHalData->MCSTxPowerLevelOriginalOffset[pHalData->pwrGroupCnt][9] = Data; 620 - /* RT_TRACE(COMP_INIT, DBG_TRACE, 621 - ("MCSTxPowerLevelOriginalOffset[%d][9] = 0x%lx\n", 622 - pHalData->pwrGroupCnt, */ 623 - /* pHalData->MCSTxPowerLevelOriginalOffset[ 624 - pHalData->pwrGroupCnt][9])); */ 625 578 } 626 579 if (RegAddr == rTxAGC_B_CCK1_55_Mcs32) { 627 580 pHalData->MCSTxPowerLevelOriginalOffset[pHalData->pwrGroupCnt][14] = Data; 628 - /* RT_TRACE(COMP_INIT, DBG_TRACE, 629 - ("MCSTxPowerLevelOriginalOffset[%d][14] = 0x%lx\n", 630 - pHalData->pwrGroupCnt, */ 631 - /* pHalData->MCSTxPowerLevelOriginalOffset[ 632 - pHalData->pwrGroupCnt][14])); */ 633 581 } 634 582 if (RegAddr == rTxAGC_B_CCK11_A_CCK2_11 && BitMask == 0x000000ff) { 635 583 pHalData->MCSTxPowerLevelOriginalOffset[pHalData->pwrGroupCnt][15] = Data; 636 - /* RT_TRACE(COMP_INIT, DBG_TRACE, 637 - ("MCSTxPowerLevelOriginalOffset[%d][15] = 0x%lx\n", 638 - pHalData->pwrGroupCnt, */ 639 - /* pHalData->MCSTxPowerLevelOriginalOffset[ 640 - pHalData->pwrGroupCnt][15])); */ 641 584 } 642 585 if (RegAddr == rTxAGC_B_Mcs03_Mcs00) { 643 586 pHalData->MCSTxPowerLevelOriginalOffset[pHalData->pwrGroupCnt][10] = Data; 644 - /* RT_TRACE(COMP_INIT, DBG_TRACE, 645 - ("MCSTxPowerLevelOriginalOffset[%d][10] = 0x%lx\n", 646 - pHalData->pwrGroupCnt, */ 647 - /* pHalData->MCSTxPowerLevelOriginalOffset[ 648 - pHalData->pwrGroupCnt][10])); */ 649 587 } 650 588 if (RegAddr == rTxAGC_B_Mcs07_Mcs04) { 651 589 pHalData->MCSTxPowerLevelOriginalOffset[pHalData->pwrGroupCnt][11] = Data; 652 - /* RT_TRACE(COMP_INIT, DBG_TRACE, 653 - ("MCSTxPowerLevelOriginalOffset[%d][11] = 0x%lx\n", 654 - pHalData->pwrGroupCnt, */ 655 - /* pHalData->MCSTxPowerLevelOriginalOffset[ 656 - pHalData->pwrGroupCnt][11])); */ 657 590 } 658 591 if (RegAddr == rTxAGC_B_Mcs11_Mcs08) { 659 592 pHalData->MCSTxPowerLevelOriginalOffset[pHalData->pwrGroupCnt][12] = Data; 660 - /* RT_TRACE(COMP_INIT, DBG_TRACE, 661 - ("MCSTxPowerLevelOriginalOffset[%d][12] = 0x%lx\n", 662 - pHalData->pwrGroupCnt, */ 663 - /* pHalData->MCSTxPowerLevelOriginalOffset[ 664 - pHalData->pwrGroupCnt][12])); */ 665 593 } 666 594 if (RegAddr == rTxAGC_B_Mcs15_Mcs12) { 667 595 pHalData->MCSTxPowerLevelOriginalOffset[pHalData->pwrGroupCnt][13] = Data; 668 - /* RT_TRACE(COMP_INIT, DBG_TRACE, 669 - ("MCSTxPowerLevelOriginalOffset[%d][13] = 0x%lx\n", 670 - pHalData->pwrGroupCnt, */ 671 - /* pHalData->MCSTxPowerLevelOriginalOffset[ 672 - pHalData->pwrGroupCnt][13])); */ 673 596 pHalData->pwrGroupCnt++; 674 597 } 675 598 } ··· 891 974 break; 892 975 893 976 default: 894 - /*RT_TRACE(COMP_DBG, DBG_LOUD, 895 - ("PHY_SetBWMode23aCallback8192C(): unknown Bandwidth: %#X\n" \ 896 - , pHalData->CurrentChannelBW));*/ 897 - break; 977 + break; 898 978 } 899 979 /* Skip over setting of J-mode in BB register here. Default value 900 980 is "None J mode". Emily 20070315 */ ··· 900 986 /* NowL = PlatformEFIORead4Byte(Adapter, TSFR); */ 901 987 /* NowH = PlatformEFIORead4Byte(Adapter, TSFR+4); */ 902 988 /* EndTime = ((u64)NowH << 32) + NowL; */ 903 - /* RT_TRACE(COMP_SCAN, DBG_LOUD, ("SetBWMode23aCallback8190Pci: time 904 - of SetBWMode23a = %I64d us!\n", (EndTime - BeginTime))); */ 905 989 906 990 rtl8723a_phy_rf6052set_bw(Adapter, pHalData->CurrentChannelBW); 907 - 908 - /* RT_TRACE(COMP_SCAN, DBG_LOUD, 909 - ("<== PHY_SetBWMode23aCallback8192C() \n")); */ 910 991 } 911 992 912 993 /*-----------------------------------------------------------------------------
+1 -1
drivers/staging/rtl8723au/hal/rtl8723au_recv.c
··· 48 48 if (!precvpriv->precv_buf) { 49 49 res = _FAIL; 50 50 RT_TRACE(_module_rtl871x_recv_c_, _drv_err_, 51 - ("alloc recv_buf fail!\n")); 51 + "alloc recv_buf fail!\n"); 52 52 goto exit; 53 53 } 54 54
+9 -7
drivers/staging/rtl8723au/hal/rtl8723au_xmit.c
··· 272 272 if (bmcst) 273 273 ptxdesc->txdw0 |= cpu_to_le32(BIT(24)); 274 274 275 - RT_TRACE(_module_rtl871x_xmit_c_, _drv_info_, ("offset0-txdesc = 0x%x\n", ptxdesc->txdw0)); 275 + RT_TRACE(_module_rtl871x_xmit_c_, _drv_info_, 276 + "offset0-txdesc = 0x%x\n", ptxdesc->txdw0); 276 277 277 278 /* offset 4 */ 278 279 /* pkt_offset, unit:8 bytes padding */ ··· 304 303 305 304 mem_addr = pxmitframe->buf_addr; 306 305 307 - RT_TRACE(_module_rtl871x_xmit_c_, _drv_info_, ("rtw_dump_xframe()\n")); 306 + RT_TRACE(_module_rtl871x_xmit_c_, _drv_info_, "rtw_dump_xframe()\n"); 308 307 309 308 for (t = 0; t < pattrib->nr_frags; t++) { 310 309 if (inner_ret != _SUCCESS && ret == _SUCCESS) ··· 312 311 313 312 if (t != (pattrib->nr_frags - 1)) { 314 313 RT_TRACE(_module_rtl871x_xmit_c_, _drv_err_, 315 - ("pattrib->nr_frags =%d\n", pattrib->nr_frags)); 314 + "pattrib->nr_frags =%d\n", pattrib->nr_frags); 316 315 317 316 sz = pxmitpriv->frag_len; 318 317 sz = sz - 4 - pattrib->icv_len; ··· 339 338 rtw_count_tx_stats23a(padapter, pxmitframe, sz); 340 339 341 340 RT_TRACE(_module_rtl871x_xmit_c_, _drv_info_, 342 - ("rtw_write_port, w_sz =%d\n", w_sz)); 341 + "rtw_write_port, w_sz =%d\n", w_sz); 343 342 344 343 mem_addr += w_sz; 345 344 ··· 366 365 phwxmits = pxmitpriv->hwxmits; 367 366 hwentry = pxmitpriv->hwxmit_entry; 368 367 369 - RT_TRACE(_module_rtl871x_xmit_c_, _drv_info_, ("xmitframe_complete()\n")); 368 + RT_TRACE(_module_rtl871x_xmit_c_, _drv_info_, "xmitframe_complete()\n"); 370 369 371 370 if (pxmitbuf == NULL) { 372 371 pxmitbuf = rtw_alloc_xmitbuf23a(pxmitpriv); ··· 389 388 rtw_os_xmit_complete23a(padapter, pxmitframe);/* always return ndis_packet after rtw_xmitframe_coalesce23a */ 390 389 } 391 390 392 - RT_TRACE(_module_rtl871x_xmit_c_, _drv_info_, ("xmitframe_complete(): rtw_dump_xframe\n")); 391 + RT_TRACE(_module_rtl871x_xmit_c_, _drv_info_, 392 + "xmitframe_complete(): rtw_dump_xframe\n"); 393 393 394 394 if (res == _SUCCESS) { 395 395 rtw_dump_xframe(padapter, pxmitframe); ··· 483 481 484 482 if (res != _SUCCESS) { 485 483 RT_TRACE(_module_xmit_osdep_c_, _drv_err_, 486 - ("pre_xmitframe: enqueue xmitframe fail\n")); 484 + "pre_xmitframe: enqueue xmitframe fail\n"); 487 485 rtw_free_xmitframe23a(pxmitpriv, pxmitframe); 488 486 489 487 /* Trick, make the statistics correct */
+19 -21
drivers/staging/rtl8723au/hal/usb_halinit.c
··· 516 516 /* Check if MAC has already power on. by tynli. 2011.05.27. */ 517 517 val8 = rtl8723au_read8(Adapter, REG_CR); 518 518 RT_TRACE(_module_hci_hal_init_c_, _drv_info_, 519 - ("%s: REG_CR 0x100 = 0x%02x\n", __func__, val8)); 519 + "%s: REG_CR 0x100 = 0x%02x\n", __func__, val8); 520 520 /* Fix 92DU-VC S3 hang with the reason is that secondary mac is not 521 521 initialized. */ 522 522 /* 0x100 value of first mac is 0xEA while 0x100 value of secondary ··· 526 526 } else { 527 527 mac_on = true; 528 528 RT_TRACE(_module_hci_hal_init_c_, _drv_info_, 529 - ("%s: MAC has already power on\n", __func__)); 529 + "%s: MAC has already power on\n", __func__); 530 530 } 531 531 532 532 status = _InitPowerOn(Adapter); 533 533 if (status == _FAIL) { 534 534 RT_TRACE(_module_hci_hal_init_c_, _drv_err_, 535 - ("Failed to init power on!\n")); 535 + "Failed to init power on!\n"); 536 536 goto exit; 537 537 } 538 538 ··· 547 547 status = InitLLTTable23a(Adapter, boundary); 548 548 if (status == _FAIL) { 549 549 RT_TRACE(_module_hci_hal_init_c_, _drv_err_, 550 - ("Failed to init LLT table\n")); 550 + "Failed to init LLT table\n"); 551 551 goto exit; 552 552 } 553 553 } ··· 623 623 rtl8723au_write32(Adapter, rFPGA0_XA_RFInterfaceOE, 0x66F60210); 624 624 625 625 RT_TRACE(_module_hci_hal_init_c_, _drv_info_, 626 - ("%s: 0x870 = value 0x%x\n", __func__, 627 - rtl8723au_read32(Adapter, 0x870))); 626 + "%s: 0x870 = value 0x%x\n", __func__, 627 + rtl8723au_read32(Adapter, 0x870)); 628 628 629 629 /* */ 630 630 /* Joseph Note: Keep RfRegChnlVal for later use. */ ··· 744 744 if (((rtl8723au_read32(Adapter, rFPGA0_RFMOD) & 0xFF000000) != 745 745 0x83000000)) { 746 746 PHY_SetBBReg(Adapter, rFPGA0_RFMOD, BIT(24), 1); 747 - RT_TRACE(_module_hci_hal_init_c_, _drv_err_, ("%s: IQK fail recorver\n", __func__)); 747 + RT_TRACE(_module_hci_hal_init_c_, _drv_err_, 748 + "%s: IQK fail recover\n", __func__); 748 749 } 749 750 750 751 /* ack for xmit mgmt frames. */ ··· 818 817 else 819 818 sps0 &= ~(BIT(0) | BIT(3)); 820 819 821 - RT_TRACE(_module_hal_init_c_, _drv_err_, ("SS LVL1\n")); 820 + RT_TRACE(_module_hal_init_c_, _drv_err_, "SS LVL1\n"); 822 821 /* Disable RF and BB only for SelectSuspend. */ 823 822 824 823 /* 1. Set BB/RF to shutdown. */ ··· 934 933 935 934 status = _SUCCESS; 936 935 937 - RT_TRACE(_module_hci_hal_init_c_, _drv_info_, ("===> usb_inirp_init\n")); 936 + RT_TRACE(_module_hci_hal_init_c_, _drv_info_, "===> usb_inirp_init\n"); 938 937 939 938 /* issue Rx irp to receive data */ 940 939 precvbuf = (struct recv_buf *)precvpriv->precv_buf; 941 940 for (i = 0; i < NR_RECVBUFF; i++) { 942 941 if (rtl8723au_read_port(Adapter, 0, precvbuf) == _FAIL) { 943 942 RT_TRACE(_module_hci_hal_init_c_, _drv_err_, 944 - ("usb_rx_init: usb_read_port error\n")); 943 + "usb_rx_init: usb_read_port error\n"); 945 944 status = _FAIL; 946 945 goto exit; 947 946 } ··· 949 948 } 950 949 if (rtl8723au_read_interrupt(Adapter) == _FAIL) { 951 950 RT_TRACE(_module_hci_hal_init_c_, _drv_err_, 952 - ("%s: usb_read_interrupt error\n", __func__)); 951 + "%s: usb_read_interrupt error\n", __func__); 953 952 status = _FAIL; 954 953 } 955 954 pHalData->IntrMask[0] = rtl8723au_read32(Adapter, REG_USB_HIMR); ··· 958 957 rtl8723au_write32(Adapter, REG_USB_HIMR, pHalData->IntrMask[0]); 959 958 exit: 960 959 RT_TRACE(_module_hci_hal_init_c_, _drv_info_, 961 - ("<=== usb_inirp_init\n")); 960 + "<=== usb_inirp_init\n"); 962 961 return status; 963 962 } 964 963 ··· 967 966 struct hal_data_8723a *pHalData = GET_HAL_DATA(Adapter); 968 967 969 968 RT_TRACE(_module_hci_hal_init_c_, _drv_info_, 970 - ("\n ===> usb_rx_deinit\n")); 969 + "===> usb_rx_deinit\n"); 971 970 rtl8723au_read_port_cancel(Adapter); 972 971 pHalData->IntrMask[0] = rtl8723au_read32(Adapter, REG_USB_HIMR); 973 972 MSG_8723A("%s pHalData->IntrMask = 0x%04x\n", __func__, ··· 975 974 pHalData->IntrMask[0] = 0x0; 976 975 rtl8723au_write32(Adapter, REG_USB_HIMR, pHalData->IntrMask[0]); 977 976 RT_TRACE(_module_hci_hal_init_c_, _drv_info_, 978 - ("\n <=== usb_rx_deinit\n")); 977 + "<=== usb_rx_deinit\n"); 979 978 return _SUCCESS; 980 979 } 981 980 ··· 1022 1021 } 1023 1022 1024 1023 RT_TRACE(_module_hci_hal_init_c_, _drv_notice_, 1025 - ("Hal_EfuseParseMACAddr_8723AU: Permanent Address =%02x:%02x:" 1026 - "%02x:%02x:%02x:%02x\n", 1027 - pEEPROM->mac_addr[0], pEEPROM->mac_addr[1], 1028 - pEEPROM->mac_addr[2], pEEPROM->mac_addr[3], 1029 - pEEPROM->mac_addr[4], pEEPROM->mac_addr[5])); 1024 + "Hal_EfuseParseMACAddr_8723AU: Permanent Address =%02x:%02x:%02x:%02x:%02x:%02x\n", 1025 + pEEPROM->mac_addr[0], pEEPROM->mac_addr[1], 1026 + pEEPROM->mac_addr[2], pEEPROM->mac_addr[3], 1027 + pEEPROM->mac_addr[4], pEEPROM->mac_addr[5]); 1030 1028 } 1031 1029 1032 1030 static void readAdapterInfo(struct rtw_adapter *padapter) ··· 1165 1165 } 1166 1166 break; 1167 1167 default: 1168 - /* RT_TRACE(COMP_INIT, DBG_WARNING, ("GetHalDefVar8192CUsb(): " 1169 - "Unkown variable: %d!\n", eVariable)); */ 1170 1168 bResult = _FAIL; 1171 1169 break; 1172 1170 }
+22 -30
drivers/staging/rtl8723au/hal/usb_ops_linux.c
··· 297 297 case -ENODEV: 298 298 case -ESHUTDOWN: 299 299 RT_TRACE(_module_hci_ops_os_c_, _drv_err_, 300 - ("usb_read_port_complete:bSurpriseRemoved =" 301 - "true\n")); 300 + "usb_read_port_complete:bSurpriseRemoved =true\n"); 302 301 /* Fall Through here */ 303 302 case -ENOENT: 304 303 padapter->bDriverStopped = true; 305 304 RT_TRACE(_module_hci_ops_os_c_, _drv_err_, 306 - ("usb_read_port_complete:bDriverStopped =" 307 - "true\n")); 305 + "usb_read_port_complete:bDriverStopped =true\n"); 308 306 break; 309 307 case -EPROTO: 310 308 break; ··· 365 367 366 368 do { 367 369 RT_TRACE(_module_rtl871x_recv_c_, _drv_info_, 368 - ("recvbuf2recvframe: rxdesc = offsset 0:0x%08x, " 369 - "4:0x%08x, 8:0x%08x, C:0x%08x\n", prxstat->rxdw0, 370 - prxstat->rxdw1, prxstat->rxdw2, prxstat->rxdw4)); 370 + "recvbuf2recvframe: rxdesc = offsset 0:0x%08x, 4:0x%08x, 8:0x%08x, C:0x%08x\n", 371 + prxstat->rxdw0, prxstat->rxdw1, 372 + prxstat->rxdw2, prxstat->rxdw4); 371 373 372 374 prxstat = (struct recv_stat *)pbuf; 373 375 374 376 precvframe = rtw_alloc_recvframe23a(pfree_recv_queue); 375 377 if (!precvframe) { 376 378 RT_TRACE(_module_rtl871x_recv_c_, _drv_err_, 377 - ("recvbuf2recvframe: precvframe == NULL\n")); 379 + "recvbuf2recvframe: precvframe == NULL\n"); 378 380 DBG_8723A("%s()-%d: rtw_alloc_recvframe23a() failed! RX " 379 381 "Drop!\n", __func__, __LINE__); 380 382 goto _exit_recvbuf2recvframe; ··· 398 400 399 401 if (pattrib->pkt_len <= 0 || pkt_offset > transfer_len) { 400 402 RT_TRACE(_module_rtl871x_recv_c_, _drv_info_, 401 - ("recvbuf2recvframe: pkt_len<= 0\n")); 403 + "recvbuf2recvframe: pkt_len<= 0\n"); 402 404 DBG_8723A("%s()-%d: RX Warning!\n", 403 405 __func__, __LINE__); 404 406 rtw_free_recvframe23a(precvframe); ··· 469 471 470 472 if (rtw_recv_entry23a(precvframe) != _SUCCESS) 471 473 RT_TRACE(_module_rtl871x_recv_c_, _drv_err_, 472 - ("recvbuf2recvframe: rtw_recv_entry23a" 473 - "(precvframe) != _SUCCESS\n")); 474 + "recvbuf2recvframe: rtw_recv_entry23a(precvframe) != _SUCCESS\n"); 474 475 475 476 pkt_cnt--; 476 477 transfer_len -= pkt_offset; ··· 517 520 struct recv_priv *precvpriv = &padapter->recvpriv; 518 521 519 522 RT_TRACE(_module_hci_ops_os_c_, _drv_err_, 520 - ("usb_read_port_complete!!!\n")); 523 + "usb_read_port_complete!!!\n"); 521 524 522 525 precvpriv->rx_pending_cnt--; 523 526 524 527 if (padapter->bSurpriseRemoved || padapter->bDriverStopped || 525 528 padapter->bReadPortCancel) { 526 529 RT_TRACE(_module_hci_ops_os_c_, _drv_err_, 527 - ("usb_read_port_complete:bDriverStopped(%d) OR " 528 - "bSurpriseRemoved(%d)\n", padapter->bDriverStopped, 529 - padapter->bSurpriseRemoved)); 530 + "usb_read_port_complete:bDriverStopped(%d) OR bSurpriseRemoved(%d)\n", 531 + padapter->bDriverStopped, padapter->bSurpriseRemoved); 530 532 531 533 DBG_8723A("%s()-%d: RX Warning! bDriverStopped(%d) OR " 532 534 "bSurpriseRemoved(%d) bReadPortCancel(%d)\n", ··· 538 542 if (purb->actual_length > MAX_RECVBUF_SZ || 539 543 purb->actual_length < RXDESC_SIZE) { 540 544 RT_TRACE(_module_hci_ops_os_c_, _drv_err_, 541 - ("usb_read_port_complete: (purb->actual_" 542 - "length > MAX_RECVBUF_SZ) || (purb->actual_" 543 - "length < RXDESC_SIZE)\n")); 545 + "usb_read_port_complete: (purb->actual_length > MAX_RECVBUF_SZ) || (purb->actual_length < RXDESC_SIZE)\n"); 544 546 rtl8723au_read_port(padapter, 0, precvbuf); 545 547 DBG_8723A("%s()-%d: RX Warning!\n", 546 548 __func__, __LINE__); ··· 558 564 } 559 565 } else { 560 566 RT_TRACE(_module_hci_ops_os_c_, _drv_err_, 561 - ("usb_read_port_complete : purb->status(%d) != 0 \n", 562 - purb->status)); 567 + "usb_read_port_complete : purb->status(%d) != 0\n", 568 + purb->status); 563 569 skb_put(precvbuf->pskb, purb->actual_length); 564 570 precvbuf->pskb = NULL; 565 571 ··· 577 583 case -ENODEV: 578 584 case -ESHUTDOWN: 579 585 RT_TRACE(_module_hci_ops_os_c_, _drv_err_, 580 - ("usb_read_port_complete:bSurprise" 581 - "Removed = true\n")); 586 + "usb_read_port_complete:bSurpriseRemoved = true\n"); 582 587 /* Intentional fall through here */ 583 588 case -ENOENT: 584 589 padapter->bDriverStopped = true; 585 590 RT_TRACE(_module_hci_ops_os_c_, _drv_err_, 586 - ("usb_read_port_complete:" 587 - "bDriverStopped = true\n")); 591 + "usb_read_port_complete:bDriverStopped = true\n"); 588 592 break; 589 593 case -EPROTO: 590 594 case -EOVERFLOW: ··· 612 620 613 621 if (adapter->bDriverStopped || adapter->bSurpriseRemoved) { 614 622 RT_TRACE(_module_hci_ops_os_c_, _drv_err_, 615 - ("usb_read_port:(padapter->bDriverStopped ||" 616 - "padapter->bSurpriseRemoved)!!!\n")); 623 + "usb_read_port:(padapter->bDriverStopped ||padapter->bSurpriseRemoved)!!!\n"); 617 624 return _FAIL; 618 625 } 619 626 620 627 if (!precvbuf) { 621 628 RT_TRACE(_module_hci_ops_os_c_, _drv_err_, 622 - ("usb_read_port:precvbuf == NULL\n")); 629 + "usb_read_port:precvbuf == NULL\n"); 623 630 return _FAIL; 624 631 } 625 632 ··· 629 638 if (!precvbuf->pskb) { 630 639 precvbuf->pskb = netdev_alloc_skb(adapter->pnetdev, MAX_RECVBUF_SZ + RECVBUFF_ALIGN_SZ); 631 640 if (precvbuf->pskb == NULL) { 632 - RT_TRACE(_module_hci_ops_os_c_, _drv_err_, ("init_recvbuf(): alloc_skb fail!\n")); 641 + RT_TRACE(_module_hci_ops_os_c_, _drv_err_, 642 + "init_recvbuf(): alloc_skb fail!\n"); 633 643 return _FAIL; 634 644 } 635 645 ··· 653 661 err = usb_submit_urb(purb, GFP_ATOMIC); 654 662 if ((err) && (err != -EPERM)) { 655 663 RT_TRACE(_module_hci_ops_os_c_, _drv_err_, 656 - ("cannot submit rx in-token(err = 0x%.8x), URB_STATUS " 657 - "= 0x%.8x", err, purb->status)); 664 + "cannot submit rx in-token(err = 0x%.8x), URB_STATUS = 0x%.8x\n", 665 + err, purb->status); 658 666 DBG_8723A("cannot submit rx in-token(err = 0x%08x), urb_status " 659 667 "= %d\n", err, purb->status); 660 668 ret = _FAIL;
+5 -6
drivers/staging/rtl8723au/include/rtw_debug.h
··· 163 163 164 164 extern u32 GlobalDebugLevel23A; 165 165 166 + __printf(3, 4) 167 + void rt_trace(int comp, int level, const char *fmt, ...); 166 168 167 - #define RT_TRACE(_Comp, _Level, Fmt) \ 169 + #define RT_TRACE(_Comp, _Level, Fmt, ...) \ 168 170 do { \ 169 - if (_Level <= GlobalDebugLevel23A) { \ 170 - pr_info("%s [0x%08x,%d]", DRIVER_PREFIX, \ 171 - (unsigned int)_Comp, _Level); \ 172 - pr_info Fmt; \ 173 - } \ 171 + if (_Level <= GlobalDebugLevel23A) \ 172 + rt_trace(_Comp, _Level, Fmt, ##__VA_ARGS__); \ 174 173 } while (0) 175 174 176 175 #define RT_PRINT_DATA(_Comp, _Level, _TitleString, _HexData, \
+43 -48
drivers/staging/rtl8723au/os_dep/ioctl_cfg80211.c
··· 729 729 if (keyparms->cipher == WLAN_CIPHER_SUITE_WEP40 || 730 730 keyparms->cipher == WLAN_CIPHER_SUITE_WEP104) { 731 731 RT_TRACE(_module_rtl871x_ioctl_os_c, _drv_err_, 732 - ("wpa_set_encryption, crypt.alg = WEP\n")); 732 + "wpa_set_encryption, crypt.alg = WEP\n"); 733 733 DBG_8723A("wpa_set_encryption, crypt.alg = WEP\n"); 734 734 735 735 if (psecuritypriv->bWepDefaultKeyIdxSet == 0) { ··· 1127 1127 old_mode = cur_network->network.ifmode; 1128 1128 1129 1129 RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_notice_, 1130 - ("+%s: old =%d new =%d fw_state = 0x%08x\n", __func__, 1131 - old_mode, ifmode, get_fwstate(pmlmepriv))); 1130 + "+%s: old =%d new =%d fw_state = 0x%08x\n", __func__, 1131 + old_mode, ifmode, get_fwstate(pmlmepriv)); 1132 1132 1133 1133 if (old_mode != ifmode) { 1134 1134 spin_lock_bh(&pmlmepriv->lock); 1135 1135 1136 1136 RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_info_, 1137 - (" change mode!")); 1137 + "change mode!\n"); 1138 1138 1139 1139 if (old_mode == NL80211_IFTYPE_AP || 1140 1140 old_mode == NL80211_IFTYPE_P2P_GO) { ··· 1193 1193 } 1194 1194 1195 1195 /* SecClearAllKeys(adapter); */ 1196 - 1197 - /* RT_TRACE(COMP_OID_SET, DBG_LOUD, 1198 - ("set_infrastructure: fw_state:%x after changing mode\n", */ 1199 - /* get_fwstate(pmlmepriv))); */ 1200 1196 1201 1197 spin_unlock_bh(&pmlmepriv->lock); 1202 1198 } ··· 1598 1602 pie[i + 4], pie[i + 5], pie[i + 6], pie[i + 7]); 1599 1603 if (ielen < RSN_HEADER_LEN) { 1600 1604 RT_TRACE(_module_rtl871x_ioctl_os_c, _drv_err_, 1601 - ("Ie len too short %d\n", (int)ielen)); 1605 + "Ie len too short %d\n", (int)ielen); 1602 1606 ret = -1; 1603 1607 goto exit; 1604 1608 } ··· 1721 1725 rtl8723a_off_rcr_am(padapter); 1722 1726 1723 1727 RT_TRACE(_module_rtl871x_ioctl_os_c, _drv_info_, 1724 - ("rtw_set_wpa_ie: pairwise_cipher = 0x%08x padapter->" 1725 - "securitypriv.ndisencryptstatus =%d padapter->" 1726 - "securitypriv.ndisauthtype =%d\n", pairwise_cipher, 1727 - padapter->securitypriv.ndisencryptstatus, 1728 - padapter->securitypriv.ndisauthtype)); 1728 + "rtw_set_wpa_ie: pairwise_cipher = 0x%08x padapter->securitypriv.ndisencryptstatus =%d padapter->securitypriv.ndisauthtype =%d\n", 1729 + pairwise_cipher, 1730 + padapter->securitypriv.ndisencryptstatus, 1731 + padapter->securitypriv.ndisauthtype); 1729 1732 1730 1733 exit: 1731 1734 if (ret) ··· 1740 1745 1741 1746 if (keyid >= NUM_WEP_KEYS) { 1742 1747 RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_err_, 1743 - ("%s:keyid>4 =>fail\n", __func__)); 1748 + "%s:keyid>4 =>fail\n", __func__); 1744 1749 res = _FAIL; 1745 1750 goto exit; 1746 1751 } ··· 1749 1754 case WLAN_KEY_LEN_WEP40: 1750 1755 psecuritypriv->dot11PrivacyAlgrthm = WLAN_CIPHER_SUITE_WEP40; 1751 1756 RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_info_, 1752 - ("%s:wep->KeyLength = 5\n", __func__)); 1757 + "%s:wep->KeyLength = 5\n", __func__); 1753 1758 break; 1754 1759 case WLAN_KEY_LEN_WEP104: 1755 1760 psecuritypriv->dot11PrivacyAlgrthm = WLAN_CIPHER_SUITE_WEP104; 1756 1761 RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_info_, 1757 - ("%s:wep->KeyLength = 13\n", __func__)); 1762 + "%s:wep->KeyLength = 13\n", __func__); 1758 1763 break; 1759 1764 default: 1760 1765 psecuritypriv->dot11PrivacyAlgrthm = 0; 1761 1766 RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_info_, 1762 - ("%s:wep->KeyLength!= 5 or 13\n", __func__)); 1767 + "%s:wep->KeyLength!= 5 or 13\n", __func__); 1763 1768 res = _FAIL; 1764 1769 goto exit; 1765 1770 } 1766 1771 1767 1772 RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_info_, 1768 - ("%s:before memcpy, wep->KeyLength = 0x%x keyid =%x\n", 1769 - __func__, wep->keylen, keyid)); 1773 + "%s:before memcpy, wep->KeyLength = 0x%x keyid =%x\n", 1774 + __func__, wep->keylen, keyid); 1770 1775 1771 1776 memcpy(&psecuritypriv->wep_key[keyid], wep, sizeof(struct rtw_wep_key)); 1772 1777 1773 1778 psecuritypriv->dot11PrivacyKeyIndex = keyid; 1774 1779 1775 1780 RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_info_, 1776 - ("%s:security key material : " 1777 - "%x %x %x %x %x %x %x %x %x %x %x %x %x\n", __func__, 1778 - psecuritypriv->wep_key[keyid].key[0], 1779 - psecuritypriv->wep_key[keyid].key[1], 1780 - psecuritypriv->wep_key[keyid].key[2], 1781 - psecuritypriv->wep_key[keyid].key[3], 1782 - psecuritypriv->wep_key[keyid].key[4], 1783 - psecuritypriv->wep_key[keyid].key[5], 1784 - psecuritypriv->wep_key[keyid].key[6], 1785 - psecuritypriv->wep_key[keyid].key[7], 1786 - psecuritypriv->wep_key[keyid].key[8], 1787 - psecuritypriv->wep_key[keyid].key[9], 1788 - psecuritypriv->wep_key[keyid].key[10], 1789 - psecuritypriv->wep_key[keyid].key[11], 1790 - psecuritypriv->wep_key[keyid].key[12])); 1781 + "%s:security key material : %x %x %x %x %x %x %x %x %x %x %x %x %x\n", 1782 + __func__, 1783 + psecuritypriv->wep_key[keyid].key[0], 1784 + psecuritypriv->wep_key[keyid].key[1], 1785 + psecuritypriv->wep_key[keyid].key[2], 1786 + psecuritypriv->wep_key[keyid].key[3], 1787 + psecuritypriv->wep_key[keyid].key[4], 1788 + psecuritypriv->wep_key[keyid].key[5], 1789 + psecuritypriv->wep_key[keyid].key[6], 1790 + psecuritypriv->wep_key[keyid].key[7], 1791 + psecuritypriv->wep_key[keyid].key[8], 1792 + psecuritypriv->wep_key[keyid].key[9], 1793 + psecuritypriv->wep_key[keyid].key[10], 1794 + psecuritypriv->wep_key[keyid].key[11], 1795 + psecuritypriv->wep_key[keyid].key[12]); 1791 1796 1792 1797 res = rtw_set_key23a(padapter, psecuritypriv, keyid, 1); 1793 1798 ··· 1809 1814 1810 1815 if (padapter->hw_init_completed == false) { 1811 1816 RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_err_, 1812 - ("set_ssid: hw_init_completed == false =>exit!!!\n")); 1817 + "set_ssid: hw_init_completed == false =>exit!!!\n"); 1813 1818 status = _FAIL; 1814 1819 goto exit; 1815 1820 } ··· 1822 1827 1823 1828 if (check_fwstate(pmlmepriv, _FW_LINKED|WIFI_ADHOC_MASTER_STATE)) { 1824 1829 RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_info_, 1825 - ("set_ssid: _FW_LINKED||WIFI_ADHOC_MASTER_STATE\n")); 1830 + "set_ssid: _FW_LINKED||WIFI_ADHOC_MASTER_STATE\n"); 1826 1831 1827 1832 if (pmlmepriv->assoc_ssid.ssid_len == 1828 1833 newnetwork->network.Ssid.ssid_len && ··· 1831 1836 newnetwork->network.Ssid.ssid_len)) { 1832 1837 if (!check_fwstate(pmlmepriv, WIFI_STATION_STATE)) { 1833 1838 RT_TRACE(_module_rtl871x_ioctl_set_c_, 1834 - _drv_err_, ("New SSID is same SSID, " 1835 - "fw_state = 0x%08x\n", 1836 - get_fwstate(pmlmepriv))); 1839 + _drv_err_, 1840 + "New SSID is same SSID, fw_state = 0x%08x\n", 1841 + get_fwstate(pmlmepriv)); 1837 1842 1838 1843 if (rtw_is_same_ibss23a(padapter, pnetwork)) { 1839 1844 /* ··· 1869 1874 } 1870 1875 } else { 1871 1876 RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_info_, 1872 - ("Set SSID not the same ssid\n")); 1877 + "Set SSID not the same ssid\n"); 1873 1878 RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_info_, 1874 - ("set_ssid =[%s] len = 0x%x\n", 1875 - newnetwork->network.Ssid.ssid, 1876 - newnetwork->network.Ssid.ssid_len)); 1879 + "set_ssid =[%s] len = 0x%x\n", 1880 + newnetwork->network.Ssid.ssid, 1881 + newnetwork->network.Ssid.ssid_len); 1877 1882 RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_info_, 1878 - ("assoc_ssid =[%s] len = 0x%x\n", 1879 - pmlmepriv->assoc_ssid.ssid, 1880 - pmlmepriv->assoc_ssid.ssid_len)); 1883 + "assoc_ssid =[%s] len = 0x%x\n", 1884 + pmlmepriv->assoc_ssid.ssid, 1885 + pmlmepriv->assoc_ssid.ssid_len); 1881 1886 1882 1887 rtw_disassoc_cmd23a(padapter, 0, true); 1883 1888 ··· 1941 1946 1942 1947 exit: 1943 1948 RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_err_, 1944 - ("-%s: status =%d\n", __func__, status)); 1949 + "-%s: status =%d\n", __func__, status); 1945 1950 1946 1951 return status; 1947 1952 }
+22 -22
drivers/staging/rtl8723au/os_dep/os_intfs.c
··· 342 342 { 343 343 if (dev_alloc_name(pnetdev, ifname) < 0) { 344 344 RT_TRACE(_module_os_intfs_c_, _drv_err_, 345 - ("dev_alloc_name, fail!\n")); 345 + "dev_alloc_name, fail!\n"); 346 346 } 347 347 netif_carrier_off(pnetdev); 348 348 return 0; ··· 357 357 struct rtw_adapter *padapter; 358 358 struct net_device *pnetdev; 359 359 360 - RT_TRACE(_module_os_intfs_c_, _drv_info_, ("+init_net_dev\n")); 360 + RT_TRACE(_module_os_intfs_c_, _drv_info_, "+init_net_dev\n"); 361 361 362 362 pnetdev = alloc_etherdev_mq(sizeof(struct rtw_adapter), 4); 363 363 if (!pnetdev) ··· 456 456 { 457 457 int ret8 = _SUCCESS; 458 458 459 - RT_TRACE(_module_os_intfs_c_, _drv_info_, ("+rtw_init_drv_sw23a\n")); 459 + RT_TRACE(_module_os_intfs_c_, _drv_info_, "+rtw_init_drv_sw23a\n"); 460 460 461 461 if (rtw_init_cmd_priv23a(&padapter->cmdpriv) == _FAIL) { 462 462 RT_TRACE(_module_os_intfs_c_, _drv_err_, 463 - ("\n Can't init cmd_priv\n")); 463 + "Can't init cmd_priv\n"); 464 464 ret8 = _FAIL; 465 465 goto exit; 466 466 } ··· 469 469 470 470 if (rtw_init_evt_priv23a(&padapter->evtpriv) == _FAIL) { 471 471 RT_TRACE(_module_os_intfs_c_, _drv_err_, 472 - ("\n Can't init evt_priv\n")); 472 + "Can't init evt_priv\n"); 473 473 ret8 = _FAIL; 474 474 goto exit; 475 475 } 476 476 477 477 if (rtw_init_mlme_priv23a(padapter) == _FAIL) { 478 478 RT_TRACE(_module_os_intfs_c_, _drv_err_, 479 - ("\n Can't init mlme_priv\n")); 479 + "Can't init mlme_priv\n"); 480 480 ret8 = _FAIL; 481 481 goto exit; 482 482 } ··· 484 484 485 485 if (init_mlme_ext_priv23a(padapter) == _FAIL) { 486 486 RT_TRACE(_module_os_intfs_c_, _drv_err_, 487 - ("\n Can't init mlme_ext_priv\n")); 487 + "Can't init mlme_ext_priv\n"); 488 488 ret8 = _FAIL; 489 489 goto exit; 490 490 } ··· 521 521 522 522 exit: 523 523 524 - RT_TRACE(_module_os_intfs_c_, _drv_info_, ("-rtw_init_drv_sw23a\n")); 524 + RT_TRACE(_module_os_intfs_c_, _drv_info_, "-rtw_init_drv_sw23a\n"); 525 525 return ret8; 526 526 } 527 527 528 528 void rtw_cancel_all_timer23a(struct rtw_adapter *padapter) 529 529 { 530 530 RT_TRACE(_module_os_intfs_c_, _drv_info_, 531 - ("+rtw_cancel_all_timer23a\n")); 531 + "+rtw_cancel_all_timer23a\n"); 532 532 533 533 del_timer_sync(&padapter->mlmepriv.assoc_timer); 534 534 RT_TRACE(_module_os_intfs_c_, _drv_info_, 535 - ("%s:cancel association timer complete!\n", __func__)); 535 + "%s:cancel association timer complete!\n", __func__); 536 536 537 537 del_timer_sync(&padapter->mlmepriv.scan_to_timer); 538 538 RT_TRACE(_module_os_intfs_c_, _drv_info_, 539 - ("%s:cancel scan_to_timer!\n", __func__)); 539 + "%s:cancel scan_to_timer!\n", __func__); 540 540 541 541 del_timer_sync(&padapter->mlmepriv.dynamic_chk_timer); 542 542 RT_TRACE(_module_os_intfs_c_, _drv_info_, 543 - ("%s:cancel dynamic_chk_timer!\n", __func__)); 543 + "%s:cancel dynamic_chk_timer!\n", __func__); 544 544 545 545 del_timer_sync(&padapter->pwrctrlpriv.pwr_state_check_timer); 546 546 547 547 del_timer_sync(&padapter->mlmepriv.set_scan_deny_timer); 548 548 rtw_clear_scan_deny(padapter); 549 549 RT_TRACE(_module_os_intfs_c_, _drv_info_, 550 - ("%s:cancel set_scan_deny_timer!\n", __func__)); 550 + "%s:cancel set_scan_deny_timer!\n", __func__); 551 551 552 552 del_timer_sync(&padapter->recvpriv.signal_stat_timer); 553 553 } 554 554 555 555 int rtw_free_drv_sw23a(struct rtw_adapter *padapter) 556 556 { 557 - RT_TRACE(_module_os_intfs_c_, _drv_info_, ("==>rtw_free_drv_sw23a")); 557 + RT_TRACE(_module_os_intfs_c_, _drv_info_, "==>rtw_free_drv_sw23a\n"); 558 558 559 559 free_mlme_ext_priv23a(&padapter->mlmeextpriv); 560 560 ··· 574 574 kfree(padapter->HalData); 575 575 padapter->HalData = NULL; 576 576 577 - RT_TRACE(_module_os_intfs_c_, _drv_info_, ("-rtw_free_drv_sw23a\n")); 577 + RT_TRACE(_module_os_intfs_c_, _drv_info_, "-rtw_free_drv_sw23a\n"); 578 578 return _SUCCESS; 579 579 } 580 580 ··· 647 647 int ret = 0; 648 648 int status; 649 649 650 - RT_TRACE(_module_os_intfs_c_, _drv_info_, ("+871x_drv - dev_open\n")); 650 + RT_TRACE(_module_os_intfs_c_, _drv_info_, "+871x_drv - dev_open\n"); 651 651 DBG_8723A("+871x_drv - drv_open, bup =%d\n", padapter->bup); 652 652 653 653 mutex_lock(&adapter_to_dvobj(padapter)->hw_init_mutex); ··· 662 662 status = rtl8723au_hal_init(padapter); 663 663 if (status == _FAIL) { 664 664 RT_TRACE(_module_os_intfs_c_, _drv_err_, 665 - ("rtl871x_hal_init(): Can't init h/w!\n")); 665 + "rtl871x_hal_init(): Can't init h/w!\n"); 666 666 goto netdev_open23a_error; 667 667 } 668 668 ··· 694 694 else 695 695 netif_tx_wake_all_queues(pnetdev); 696 696 697 - RT_TRACE(_module_os_intfs_c_, _drv_info_, ("-871x_drv - dev_open\n")); 697 + RT_TRACE(_module_os_intfs_c_, _drv_info_, "-871x_drv - dev_open\n"); 698 698 DBG_8723A("-871x_drv - drv_open, bup =%d\n", padapter->bup); 699 699 exit: 700 700 mutex_unlock(&adapter_to_dvobj(padapter)->hw_init_mutex); ··· 707 707 netif_tx_stop_all_queues(pnetdev); 708 708 709 709 RT_TRACE(_module_os_intfs_c_, _drv_err_, 710 - ("-871x_drv - dev_open, fail!\n")); 710 + "-871x_drv - dev_open, fail!\n"); 711 711 DBG_8723A("-871x_drv - drv_open fail, bup =%d\n", padapter->bup); 712 712 713 713 ret = -1; ··· 728 728 status = rtl8723au_hal_init(padapter); 729 729 if (status == _FAIL) { 730 730 RT_TRACE(_module_os_intfs_c_, _drv_err_, 731 - ("ips_netdrv_open(): Can't init h/w!\n")); 731 + "ips_netdrv_open(): Can't init h/w!\n"); 732 732 goto netdev_open23a_error; 733 733 } 734 734 ··· 806 806 { 807 807 struct rtw_adapter *padapter = netdev_priv(pnetdev); 808 808 809 - RT_TRACE(_module_os_intfs_c_, _drv_info_, ("+871x_drv - drv_close\n")); 809 + RT_TRACE(_module_os_intfs_c_, _drv_info_, "+871x_drv - drv_close\n"); 810 810 811 811 padapter->net_closed = true; 812 812 ··· 834 834 835 835 rtw_scan_abort23a(padapter); 836 836 837 - RT_TRACE(_module_os_intfs_c_, _drv_info_, ("-871x_drv - drv_close\n")); 837 + RT_TRACE(_module_os_intfs_c_, _drv_info_, "-871x_drv - drv_close\n"); 838 838 DBG_8723A("-871x_drv - drv_close, bup =%d\n", padapter->bup); 839 839 840 840 return 0;
+8 -8
drivers/staging/rtl8723au/os_dep/recv_linux.c
··· 81 81 skb = precv_frame->pkt; 82 82 if (!skb) { 83 83 RT_TRACE(_module_recv_osdep_c_, _drv_err_, 84 - ("rtw_recv_indicatepkt23a():skb == NULL!!!!\n")); 84 + "rtw_recv_indicatepkt23a():skb == NULL!!!!\n"); 85 85 goto _recv_indicatepkt_drop; 86 86 } 87 87 88 88 RT_TRACE(_module_recv_osdep_c_, _drv_info_, 89 - ("rtw_recv_indicatepkt23a():skb != NULL !!!\n")); 89 + "rtw_recv_indicatepkt23a():skb != NULL !!!\n"); 90 90 RT_TRACE(_module_recv_osdep_c_, _drv_info_, 91 - ("rtw_recv_indicatepkt23a():precv_frame->hdr.rx_data =%p\n", 92 - precv_frame->pkt->data)); 91 + "rtw_recv_indicatepkt23a():precv_frame->hdr.rx_data =%p\n", 92 + precv_frame->pkt->data); 93 93 RT_TRACE(_module_recv_osdep_c_, _drv_info_, 94 - ("\n skb->head =%p skb->data =%p skb->tail =%p skb->end =%p skb->len =%d\n", 95 - skb->head, skb->data, 96 - skb_tail_pointer(skb), skb_end_pointer(skb), skb->len)); 94 + "skb->head =%p skb->data =%p skb->tail =%p skb->end =%p skb->len =%d\n", 95 + skb->head, skb->data, 96 + skb_tail_pointer(skb), skb_end_pointer(skb), skb->len); 97 97 98 98 if (check_fwstate(pmlmepriv, WIFI_AP_STATE) == true) { 99 99 struct sk_buff *pskb2 = NULL; ··· 148 148 rtw_free_recvframe23a(precv_frame); 149 149 150 150 RT_TRACE(_module_recv_osdep_c_, _drv_info_, 151 - ("\n rtw_recv_indicatepkt23a :after netif_rx!!!!\n")); 151 + "rtw_recv_indicatepkt23a :after netif_rx!!!!\n"); 152 152 return _SUCCESS; 153 153 154 154 _recv_indicatepkt_drop:
+15 -15
drivers/staging/rtl8723au/os_dep/usb_intf.c
··· 159 159 160 160 if (rtw_init_intf_priv(pdvobjpriv) == _FAIL) { 161 161 RT_TRACE(_module_os_intfs_c_, _drv_err_, 162 - ("\n Can't INIT rtw_init_intf_priv\n")); 162 + "Can't INIT rtw_init_intf_priv\n"); 163 163 goto free_dvobj; 164 164 } 165 165 /* 3 misc */ ··· 213 213 214 214 void rtl8723a_usb_intf_stop(struct rtw_adapter *padapter) 215 215 { 216 - RT_TRACE(_module_hci_intfs_c_, _drv_err_, ("+usb_intf_stop\n")); 216 + RT_TRACE(_module_hci_intfs_c_, _drv_err_, "+usb_intf_stop\n"); 217 217 218 218 /* disable_hw_interrupt */ 219 219 if (!padapter->bSurpriseRemoved) { ··· 221 221 * TODO: 222 222 */ 223 223 RT_TRACE(_module_hci_intfs_c_, _drv_err_, 224 - ("SurpriseRemoved == false\n")); 224 + "SurpriseRemoved == false\n"); 225 225 } 226 226 227 227 /* cancel in irp */ ··· 231 231 rtl8723au_write_port_cancel(padapter); 232 232 233 233 /* todo:cancel other irps */ 234 - RT_TRACE(_module_hci_intfs_c_, _drv_err_, ("-usb_intf_stop\n")); 234 + RT_TRACE(_module_hci_intfs_c_, _drv_err_, "-usb_intf_stop\n"); 235 235 } 236 236 237 237 static void rtw_dev_unload(struct rtw_adapter *padapter) 238 238 { 239 239 struct submit_ctx *pack_tx_ops = &padapter->xmitpriv.ack_tx_ops; 240 240 241 - RT_TRACE(_module_hci_intfs_c_, _drv_err_, ("+rtw_dev_unload\n")); 241 + RT_TRACE(_module_hci_intfs_c_, _drv_err_, "+rtw_dev_unload\n"); 242 242 243 243 if (padapter->bup) { 244 244 DBG_8723A("===> rtw_dev_unload\n"); ··· 262 262 padapter->bup = false; 263 263 } else { 264 264 RT_TRACE(_module_hci_intfs_c_, _drv_err_, 265 - ("r871x_dev_unload():padapter->bup == false\n")); 265 + "r871x_dev_unload():padapter->bup == false\n"); 266 266 } 267 267 DBG_8723A("<=== rtw_dev_unload\n"); 268 - RT_TRACE(_module_hci_intfs_c_, _drv_err_, ("-rtw_dev_unload\n")); 268 + RT_TRACE(_module_hci_intfs_c_, _drv_err_, "-rtw_dev_unload\n"); 269 269 } 270 270 271 271 static int rtw_suspend(struct usb_interface *pusb_intf, pm_message_t message) ··· 436 436 /* step 5. */ 437 437 if (rtw_init_drv_sw23a(padapter) == _FAIL) { 438 438 RT_TRACE(_module_hci_intfs_c_, _drv_err_, 439 - ("Initialize driver software resource Failed!\n")); 439 + "Initialize driver software resource Failed!\n"); 440 440 goto free_hal_data; 441 441 } 442 442 ··· 534 534 struct dvobj_priv *dvobj; 535 535 int status = _FAIL; 536 536 537 - RT_TRACE(_module_hci_intfs_c_, _drv_err_, ("+rtw_drv_init\n")); 537 + RT_TRACE(_module_hci_intfs_c_, _drv_err_, "+rtw_drv_init\n"); 538 538 539 539 /* Initialize dvobj_priv */ 540 540 dvobj = usb_dvobj_init(pusb_intf); 541 541 if (!dvobj) { 542 542 RT_TRACE(_module_hci_intfs_c_, _drv_err_, 543 - ("initialize device object priv Failed!\n")); 543 + "initialize device object priv Failed!\n"); 544 544 goto exit; 545 545 } 546 546 ··· 555 555 if (status != _SUCCESS) 556 556 goto free_if1; 557 557 RT_TRACE(_module_hci_intfs_c_, _drv_err_, 558 - ("-871x_drv - drv_init, success!\n")); 558 + "-871x_drv - drv_init, success!\n"); 559 559 560 560 status = _SUCCESS; 561 561 ··· 587 587 588 588 usb_set_intfdata(pusb_intf, NULL); 589 589 590 - RT_TRACE(_module_hci_intfs_c_, _drv_err_, ("+dev_remove()\n")); 590 + RT_TRACE(_module_hci_intfs_c_, _drv_err_, "+dev_remove()\n"); 591 591 592 592 rtw_pm_set_ips23a(padapter, IPS_NONE); 593 593 rtw_pm_set_lps23a(padapter, PS_MODE_ACTIVE); ··· 598 598 599 599 usb_dvobj_deinit(pusb_intf); 600 600 601 - RT_TRACE(_module_hci_intfs_c_, _drv_err_, ("-dev_remove()\n")); 601 + RT_TRACE(_module_hci_intfs_c_, _drv_err_, "-dev_remove()\n"); 602 602 DBG_8723A("-r871xu_dev_remove, done\n"); 603 603 } 604 604 605 605 static int __init rtw_drv_entry(void) 606 606 { 607 - RT_TRACE(_module_hci_intfs_c_, _drv_err_, ("+rtw_drv_entry\n")); 607 + RT_TRACE(_module_hci_intfs_c_, _drv_err_, "+rtw_drv_entry\n"); 608 608 return usb_register(usb_drv); 609 609 } 610 610 611 611 static void __exit rtw_drv_halt(void) 612 612 { 613 - RT_TRACE(_module_hci_intfs_c_, _drv_err_, ("+rtw_drv_halt\n")); 613 + RT_TRACE(_module_hci_intfs_c_, _drv_err_, "+rtw_drv_halt\n"); 614 614 DBG_8723A("+rtw_drv_halt\n"); 615 615 616 616 usb_deregister(usb_drv);
+14 -17
drivers/staging/rtl8723au/os_dep/usb_ops_linux.c
··· 58 58 if (padapter->bSurpriseRemoved || padapter->bDriverStopped || 59 59 padapter->bWritePortCancel) { 60 60 RT_TRACE(_module_hci_ops_os_c_, _drv_err_, 61 - ("usb_write_port23a_complete:bDriverStopped(%d) OR " 62 - "bSurpriseRemoved(%d)", padapter->bDriverStopped, 63 - padapter->bSurpriseRemoved)); 61 + "usb_write_port23a_complete:bDriverStopped(%d) OR bSurpriseRemoved(%d)\n", 62 + padapter->bDriverStopped, padapter->bSurpriseRemoved); 64 63 DBG_8723A("%s(): TX Warning! bDriverStopped(%d) OR " 65 64 "bSurpriseRemoved(%d) bWritePortCancel(%d) " 66 65 "pxmitbuf->ext_tag(%x)\n", __func__, ··· 71 72 72 73 if (purb->status) { 73 74 RT_TRACE(_module_hci_ops_os_c_, _drv_err_, 74 - ("usb_write_port23a_complete : purb->status(%d) " 75 - "!= 0\n", purb->status)); 75 + "usb_write_port23a_complete : purb->status(%d) != 0\n", 76 + purb->status); 76 77 DBG_8723A("###=> urb_write_port_complete status(%d)\n", 77 78 purb->status); 78 79 if (purb->status == -EPIPE || purb->status == -EPROTO) { 79 80 } else if (purb->status == -EINPROGRESS) { 80 81 RT_TRACE(_module_hci_ops_os_c_, _drv_err_, 81 - ("usb_write_port23a_complete: EINPROGESS\n")); 82 + "usb_write_port23a_complete: EINPROGESS\n"); 82 83 goto check_completion; 83 84 } else if (purb->status == -ENOENT) { 84 85 DBG_8723A("%s: -ENOENT\n", __func__); ··· 88 89 goto check_completion; 89 90 } else if (purb->status == -ESHUTDOWN) { 90 91 RT_TRACE(_module_hci_ops_os_c_, _drv_err_, 91 - ("usb_write_port23a_complete: ESHUTDOWN\n")); 92 + "usb_write_port23a_complete: ESHUTDOWN\n"); 92 93 padapter->bDriverStopped = true; 93 94 RT_TRACE(_module_hci_ops_os_c_, _drv_err_, 94 - ("usb_write_port23a_complete:bDriverStopped " 95 - "= true\n")); 95 + "usb_write_port23a_complete:bDriverStopped = true\n"); 96 96 goto check_completion; 97 97 } else { 98 98 padapter->bSurpriseRemoved = true; 99 99 DBG_8723A("bSurpriseRemoved = true\n"); 100 100 RT_TRACE(_module_hci_ops_os_c_, _drv_err_, 101 - ("usb_write_port23a_complete:bSurpriseRemoved " 102 - "= true\n")); 101 + "usb_write_port23a_complete:bSurpriseRemoved = true\n"); 103 102 goto check_completion; 104 103 } 105 104 } ··· 129 132 int status; 130 133 int ret = _FAIL; 131 134 132 - RT_TRACE(_module_hci_ops_os_c_, _drv_err_, ("+usb_write_port23a\n")); 135 + RT_TRACE(_module_hci_ops_os_c_, _drv_err_, "+usb_write_port23a\n"); 133 136 134 137 if (padapter->bDriverStopped || padapter->bSurpriseRemoved) { 135 138 RT_TRACE(_module_hci_ops_os_c_, _drv_err_, 136 - ("%s:(padapter->bDriverStopped || " 137 - "padapter->bSurpriseRemoved)!!!\n", __func__)); 139 + "%s:(padapter->bDriverStopped || padapter->bSurpriseRemoved)!!!\n", 140 + __func__); 138 141 rtw23a_sctx_done_err(&pxmitbuf->sctx, RTW_SCTX_DONE_TX_DENY); 139 142 goto exit; 140 143 } ··· 185 188 RTW_SCTX_DONE_WRITE_PORT_ERR); 186 189 DBG_8723A("usb_write_port23a, status =%d\n", status); 187 190 RT_TRACE(_module_hci_ops_os_c_, _drv_err_, 188 - ("usb_write_port23a(): usb_submit_urb, status =%x\n", 189 - status)); 191 + "usb_write_port23a(): usb_submit_urb, status =%x\n", 192 + status); 190 193 191 194 switch (status) { 192 195 case -ENODEV: ··· 198 201 goto exit; 199 202 } 200 203 ret = _SUCCESS; 201 - RT_TRACE(_module_hci_ops_os_c_, _drv_err_, ("-usb_write_port23a\n")); 204 + RT_TRACE(_module_hci_ops_os_c_, _drv_err_, "-usb_write_port23a\n"); 202 205 203 206 exit: 204 207 if (ret != _SUCCESS)
+6 -6
drivers/staging/rtl8723au/os_dep/xmit_linux.c
··· 123 123 struct xmit_priv *pxmitpriv = &padapter->xmitpriv; 124 124 int res = 0; 125 125 126 - RT_TRACE(_module_rtl871x_mlme_c_, _drv_info_, ("+xmit_enry\n")); 126 + RT_TRACE(_module_rtl871x_mlme_c_, _drv_info_, "+xmit_enry\n"); 127 127 128 128 if (!rtw_if_up23a(padapter)) { 129 129 RT_TRACE(_module_xmit_osdep_c_, _drv_err_, 130 - ("rtw_xmit23a_entry23a: rtw_if_up23a fail\n")); 130 + "rtw_xmit23a_entry23a: rtw_if_up23a fail\n"); 131 131 goto drop_packet; 132 132 } 133 133 ··· 139 139 140 140 pxmitpriv->tx_pkts++; 141 141 RT_TRACE(_module_xmit_osdep_c_, _drv_info_, 142 - ("rtw_xmit23a_entry23a: tx_pkts=%d\n", 143 - (u32)pxmitpriv->tx_pkts)); 142 + "rtw_xmit23a_entry23a: tx_pkts=%d\n", 143 + (u32)pxmitpriv->tx_pkts); 144 144 goto exit; 145 145 146 146 drop_packet: 147 147 pxmitpriv->tx_drop++; 148 148 dev_kfree_skb_any(skb); 149 149 RT_TRACE(_module_xmit_osdep_c_, _drv_notice_, 150 - ("rtw_xmit23a_entry23a: drop, tx_drop=%d\n", 151 - (u32)pxmitpriv->tx_drop)); 150 + "rtw_xmit23a_entry23a: drop, tx_drop=%d\n", 151 + (u32)pxmitpriv->tx_drop); 152 152 exit: 153 153 return 0; 154 154 }