Skip to contentSkip to conversation

staging: rtl8723bs: hal: checkpatch cleanups

PATCH In review Amarjargal Gundjalam 3 participants 9 messages Oct 29, 2020 – Oct 30, 2020 Staging

lore
Share & tools
lore
#0 lore raw

cover staging: rtl8723bs: hal: checkpatch cleanups

This patchset fixes various issues found by checkpatch.

Amarjargal Gundjalam (4):
staging: rtl8723bs: hal: fix position of constant in comparison
staging: rtl8723bs: hal: fix space before tabs and at the start of
line
staging: rtl8723bs: hal: fix unnecessary braces
staging: rtl8723bs: hal: use __func__ instead of function name

 drivers/staging/rtl8723bs/hal/Hal8723BReg.h   |  30 +--
 .../staging/rtl8723bs/hal/HalBtc8723b1Ant.c   | 134 +++++-----
 .../staging/rtl8723bs/hal/HalBtc8723b2Ant.c   | 124 +++++-----
 drivers/staging/rtl8723bs/hal/HalBtcOutSrc.h  |   2 +-
 .../staging/rtl8723bs/hal/HalHWImg8723B_BB.c  |  10 +-
 .../staging/rtl8723bs/hal/HalHWImg8723B_MAC.c |   6 +-
 .../staging/rtl8723bs/hal/HalHWImg8723B_RF.c  |   8 +-
 drivers/staging/rtl8723bs/hal/HalPhyRf.c      |   5 +-
 .../staging/rtl8723bs/hal/HalPhyRf_8723B.c    | 222 ++++++++---------
 drivers/staging/rtl8723bs/hal/HalPwrSeqCmd.c  |  15 +-
 drivers/staging/rtl8723bs/hal/hal_btcoex.c    |  95 ++++---
 drivers/staging/rtl8723bs/hal/hal_com.c       |  32 +--
 .../staging/rtl8723bs/hal/hal_com_phycfg.c    |  84 +++----
 drivers/staging/rtl8723bs/hal/hal_intf.c      |   4 +-
 drivers/staging/rtl8723bs/hal/odm.c           |  10 +-
 drivers/staging/rtl8723bs/hal/odm.h           |  22 +-
 .../staging/rtl8723bs/hal/odm_CfoTracking.c   |  31 +--
 drivers/staging/rtl8723bs/hal/odm_DIG.c       |  85 ++++---
 .../rtl8723bs/hal/odm_EdcaTurboCheck.c        |   4 +-
 drivers/staging/rtl8723bs/hal/odm_HWConfig.c  |   6 +-
 .../rtl8723bs/hal/odm_RegConfig8723B.c        |   7 +-
 drivers/staging/rtl8723bs/hal/odm_debug.c     |  46 ++--
 drivers/staging/rtl8723bs/hal/rtl8723b_cmd.c  |  50 ++--
 drivers/staging/rtl8723bs/hal/rtl8723b_dm.c   |  11 +-
 .../staging/rtl8723bs/hal/rtl8723b_hal_init.c | 231 ++++++++----------
 .../staging/rtl8723bs/hal/rtl8723b_phycfg.c   |  42 ++--
 .../staging/rtl8723bs/hal/rtl8723bs_recv.c    |  20 +-
 .../staging/rtl8723bs/hal/rtl8723bs_xmit.c    |  22 +-
 drivers/staging/rtl8723bs/hal/sdio_halinit.c  | 100 ++++----
 29 files changed, 712 insertions(+), 746 deletions(-)
Signature · 1 line
2.25.1
#1 lore raw

PATCH 1/4 staging: rtl8723bs: hal: fix position of constant in comparison

Fix checkpatch warning "Comparisons should place the constant on the right side of the test".

---
 .../staging/rtl8723bs/hal/HalBtc8723b1Ant.c   | 112 +++++++++---------
 .../staging/rtl8723bs/hal/HalBtc8723b2Ant.c   |  82 ++++++-------
 .../staging/rtl8723bs/hal/HalPhyRf_8723B.c    |   6 +-
 drivers/staging/rtl8723bs/hal/hal_btcoex.c    |  22 ++--
 drivers/staging/rtl8723bs/hal/hal_com.c       |   2 +-
 .../staging/rtl8723bs/hal/hal_com_phycfg.c    |  56 ++++-----
 drivers/staging/rtl8723bs/hal/odm.c           |   4 +-
 drivers/staging/rtl8723bs/hal/rtl8723b_cmd.c  |   2 +-
 .../staging/rtl8723bs/hal/rtl8723b_hal_init.c |  46 +++----
 .../staging/rtl8723bs/hal/rtl8723bs_xmit.c    |   2 +-
 drivers/staging/rtl8723bs/hal/sdio_halinit.c  |   4 +-
 11 files changed, 169 insertions(+), 169 deletions(-)
drivers/staging/rtl8723bs/hal/HalBtc8723b1Ant.c +56 -56
index c60e8c58d9cc..82ace6ceca15 100644
@@ -1670,7 +1670,7 @@ static bool halbtc8723b1ant_IsCommonAction(PBTC_COEXIST pBtCoexist)
 
 	if (
 		!bWifiConnected &&
-		BT_8723B_1ANT_BT_STATUS_NON_CONNECTED_IDLE == pCoexDm->btStatus
+		pCoexDm->btStatus == BT_8723B_1ANT_BT_STATUS_NON_CONNECTED_IDLE
 	) {
 		BTC_PRINT(
 			BTC_MSG_ALGORITHM,
@@ -1683,7 +1683,7 @@ static bool halbtc8723b1ant_IsCommonAction(PBTC_COEXIST pBtCoexist)
 		bCommon = true;
 	} else if (
 		bWifiConnected &&
-		(BT_8723B_1ANT_BT_STATUS_NON_CONNECTED_IDLE == pCoexDm->btStatus)
+		(pCoexDm->btStatus == BT_8723B_1ANT_BT_STATUS_NON_CONNECTED_IDLE)
 	) {
 		BTC_PRINT(
 			BTC_MSG_ALGORITHM,
@@ -1696,7 +1696,7 @@ static bool halbtc8723b1ant_IsCommonAction(PBTC_COEXIST pBtCoexist)
 		bCommon = true;
 	} else if (
 		!bWifiConnected &&
-		(BT_8723B_1ANT_BT_STATUS_CONNECTED_IDLE == pCoexDm->btStatus)
+		(pCoexDm->btStatus == BT_8723B_1ANT_BT_STATUS_CONNECTED_IDLE)
 	) {
 		BTC_PRINT(
 			BTC_MSG_ALGORITHM,
@@ -1709,7 +1709,7 @@ static bool halbtc8723b1ant_IsCommonAction(PBTC_COEXIST pBtCoexist)
 		bCommon = true;
 	} else if (
 		bWifiConnected &&
-		(BT_8723B_1ANT_BT_STATUS_CONNECTED_IDLE == pCoexDm->btStatus)
+		(pCoexDm->btStatus == BT_8723B_1ANT_BT_STATUS_CONNECTED_IDLE)
 	) {
 		BTC_PRINT(BTC_MSG_ALGORITHM, ALGO_TRACE, ("[BTCoex], Wifi connected + BT connected-idle!!\n"));
 
@@ -1718,7 +1718,7 @@ static bool halbtc8723b1ant_IsCommonAction(PBTC_COEXIST pBtCoexist)
 		bCommon = true;
 	} else if (
 		!bWifiConnected &&
-		(BT_8723B_1ANT_BT_STATUS_CONNECTED_IDLE != pCoexDm->btStatus)
+		(pCoexDm->btStatus != BT_8723B_1ANT_BT_STATUS_CONNECTED_IDLE)
 	) {
 		BTC_PRINT(
 			BTC_MSG_ALGORITHM,
@@ -1766,9 +1766,9 @@ static void halbtc8723b1ant_TdmaDurationAdjustForAcl(
 	);
 
 	if (
-		(BT_8723B_1ANT_WIFI_STATUS_NON_CONNECTED_ASSO_AUTH_SCAN == wifiStatus) ||
-		(BT_8723B_1ANT_WIFI_STATUS_CONNECTED_SCAN == wifiStatus) ||
-		(BT_8723B_1ANT_WIFI_STATUS_CONNECTED_SPECIAL_PKT == wifiStatus)
+		(wifiStatus == BT_8723B_1ANT_WIFI_STATUS_NON_CONNECTED_ASSO_AUTH_SCAN) ||
+		(wifiStatus == BT_8723B_1ANT_WIFI_STATUS_CONNECTED_SCAN) ||
+		(wifiStatus == BT_8723B_1ANT_WIFI_STATUS_CONNECTED_SPECIAL_PKT)
 	) {
 		if (
 			pCoexDm->curPsTdma != 1 &&
@@ -2105,7 +2105,7 @@ static void halbtc8723b1ant_ActionWifiConnectedBtAclBusy(
 		pCoexDm->bAutoTdmaAdjust = false;
 		return;
 	} else if (pBtLinkInfo->bA2dpOnly) { /* A2DP */
-		if (BT_8723B_1ANT_WIFI_STATUS_CONNECTED_IDLE == wifiStatus) {
+		if (wifiStatus == BT_8723B_1ANT_WIFI_STATUS_CONNECTED_IDLE) {
 			halbtc8723b1ant_PsTdma(pBtCoexist, NORMAL_EXEC, true, 32);
 			halbtc8723b1ant_CoexTableWithType(pBtCoexist, NORMAL_EXEC, 4);
 			pCoexDm->bAutoTdmaAdjust = false;
@@ -2160,7 +2160,7 @@ static void halbtc8723b1ant_ActionWifiNotConnectedScan(
 	halbtc8723b1ant_PowerSaveState(pBtCoexist, BTC_PS_WIFI_NATIVE, 0x0, 0x0);
 
 	/*  tdma and coex table */
-	if (BT_8723B_1ANT_BT_STATUS_ACL_BUSY == pCoexDm->btStatus) {
+	if (pCoexDm->btStatus == BT_8723B_1ANT_BT_STATUS_ACL_BUSY) {
 		if (pBtLinkInfo->bA2dpExist) {
 			halbtc8723b1ant_PsTdma(pBtCoexist, NORMAL_EXEC, true, 32);
 			halbtc8723b1ant_CoexTableWithType(pBtCoexist, NORMAL_EXEC, 4);
@@ -2172,8 +2172,8 @@ static void halbtc8723b1ant_ActionWifiNotConnectedScan(
 			halbtc8723b1ant_CoexTableWithType(pBtCoexist, NORMAL_EXEC, 4);
 		}
 	} else if (
-		(BT_8723B_1ANT_BT_STATUS_SCO_BUSY == pCoexDm->btStatus) ||
-		(BT_8723B_1ANT_BT_STATUS_ACL_SCO_BUSY == pCoexDm->btStatus)
+		(pCoexDm->btStatus == BT_8723B_1ANT_BT_STATUS_SCO_BUSY) ||
+		(pCoexDm->btStatus == BT_8723B_1ANT_BT_STATUS_ACL_SCO_BUSY)
 	) {
 		halbtc8723b1ant_ActionBtScoHidOnlyBusy(
 			pBtCoexist, BT_8723B_1ANT_WIFI_STATUS_CONNECTED_SCAN
@@ -2217,7 +2217,7 @@ static void halbtc8723b1ant_ActionWifiConnectedScan(PBTC_COEXIST pBtCoexist)
 	halbtc8723b1ant_PowerSaveState(pBtCoexist, BTC_PS_WIFI_NATIVE, 0x0, 0x0);
 
 	/*  tdma and coex table */
-	if (BT_8723B_1ANT_BT_STATUS_ACL_BUSY == pCoexDm->btStatus) {
+	if (pCoexDm->btStatus == BT_8723B_1ANT_BT_STATUS_ACL_BUSY) {
 		if (pBtLinkInfo->bA2dpExist) {
 			halbtc8723b1ant_PsTdma(pBtCoexist, NORMAL_EXEC, true, 32);
 			halbtc8723b1ant_CoexTableWithType(pBtCoexist, NORMAL_EXEC, 4);
@@ -2229,8 +2229,8 @@ static void halbtc8723b1ant_ActionWifiConnectedScan(PBTC_COEXIST pBtCoexist)
 			halbtc8723b1ant_CoexTableWithType(pBtCoexist, NORMAL_EXEC, 4);
 		}
 	} else if (
-		(BT_8723B_1ANT_BT_STATUS_SCO_BUSY == pCoexDm->btStatus) ||
-		(BT_8723B_1ANT_BT_STATUS_ACL_SCO_BUSY == pCoexDm->btStatus)
+		(pCoexDm->btStatus == BT_8723B_1ANT_BT_STATUS_SCO_BUSY) ||
+		(pCoexDm->btStatus == BT_8723B_1ANT_BT_STATUS_ACL_SCO_BUSY)
 	) {
 		halbtc8723b1ant_ActionBtScoHidOnlyBusy(
 			pBtCoexist, BT_8723B_1ANT_WIFI_STATUS_CONNECTED_SCAN
@@ -2312,7 +2312,7 @@ static void halbtc8723b1ant_ActionWifiConnected(PBTC_COEXIST pBtCoexist)
 	/*  power save state */
 	if (
 		!bApEnable &&
-		BT_8723B_1ANT_BT_STATUS_ACL_BUSY == pCoexDm->btStatus &&
+		pCoexDm->btStatus == BT_8723B_1ANT_BT_STATUS_ACL_BUSY &&
 		!pBtCoexist->btLinkInfo.bHidOnly
 	) {
 		if (pBtCoexist->btLinkInfo.bA2dpOnly) { /* A2DP */
@@ -2343,14 +2343,14 @@ static void halbtc8723b1ant_ActionWifiConnected(PBTC_COEXIST pBtCoexist)
 
 	/*  tdma and coex table */
 	if (!bWifiBusy) {
-		if (BT_8723B_1ANT_BT_STATUS_ACL_BUSY == pCoexDm->btStatus) {
+		if (pCoexDm->btStatus == BT_8723B_1ANT_BT_STATUS_ACL_BUSY) {
 			halbtc8723b1ant_ActionWifiConnectedBtAclBusy(
 				pBtCoexist,
 				BT_8723B_1ANT_WIFI_STATUS_CONNECTED_IDLE
 			);
 		} else if (
-			(BT_8723B_1ANT_BT_STATUS_SCO_BUSY == pCoexDm->btStatus) ||
-			(BT_8723B_1ANT_BT_STATUS_ACL_SCO_BUSY == pCoexDm->btStatus)
+			(pCoexDm->btStatus == BT_8723B_1ANT_BT_STATUS_SCO_BUSY) ||
+			(pCoexDm->btStatus == BT_8723B_1ANT_BT_STATUS_ACL_SCO_BUSY)
 		) {
 			halbtc8723b1ant_ActionBtScoHidOnlyBusy(pBtCoexist,
 				BT_8723B_1ANT_WIFI_STATUS_CONNECTED_IDLE);
@@ -2363,14 +2363,14 @@ static void halbtc8723b1ant_ActionWifiConnected(PBTC_COEXIST pBtCoexist)
 				halbtc8723b1ant_CoexTableWithType(pBtCoexist, NORMAL_EXEC, 7);
 		}
 	} else {
-		if (BT_8723B_1ANT_BT_STATUS_ACL_BUSY == pCoexDm->btStatus) {
+		if (pCoexDm->btStatus == BT_8723B_1ANT_BT_STATUS_ACL_BUSY) {
 			halbtc8723b1ant_ActionWifiConnectedBtAclBusy(
 				pBtCoexist,
 				BT_8723B_1ANT_WIFI_STATUS_CONNECTED_BUSY
 			);
 		} else if (
-			(BT_8723B_1ANT_BT_STATUS_SCO_BUSY == pCoexDm->btStatus) ||
-			(BT_8723B_1ANT_BT_STATUS_ACL_SCO_BUSY == pCoexDm->btStatus)
+			(pCoexDm->btStatus == BT_8723B_1ANT_BT_STATUS_SCO_BUSY) ||
+			(pCoexDm->btStatus == BT_8723B_1ANT_BT_STATUS_ACL_SCO_BUSY)
 		) {
 			halbtc8723b1ant_ActionBtScoHidOnlyBusy(
 				pBtCoexist,
@@ -2474,9 +2474,9 @@ static void halbtc8723b1ant_RunCoexistMechanism(PBTC_COEXIST pBtCoexist)
 	}
 
 	if (
-		(BT_8723B_1ANT_BT_STATUS_ACL_BUSY == pCoexDm->btStatus) ||
-		(BT_8723B_1ANT_BT_STATUS_SCO_BUSY == pCoexDm->btStatus) ||
-		(BT_8723B_1ANT_BT_STATUS_ACL_SCO_BUSY == pCoexDm->btStatus)
+		(pCoexDm->btStatus == BT_8723B_1ANT_BT_STATUS_ACL_BUSY) ||
+		(pCoexDm->btStatus == BT_8723B_1ANT_BT_STATUS_SCO_BUSY) ||
+		(pCoexDm->btStatus == BT_8723B_1ANT_BT_STATUS_ACL_SCO_BUSY)
 	){
 		bIncreaseScanDevNum = true;
 	}
@@ -2869,8 +2869,8 @@ void EXhalbtc8723b1ant_DisplayCoexInfo(PBTC_COEXIST pBtCoexist)
 		BT_TMP_BUF_SIZE,
 		"\r\n %-35s = %s / %s/ %s/ AP =%d/ %s ", "Wifi status", \
 		(bWifiUnder5G ? "5G" : "2.4G"),
-		((bWifiUnderBMode) ? "11b" : ((BTC_WIFI_BW_LEGACY == wifiBw) ? "11bg" : (((BTC_WIFI_BW_HT40 == wifiBw) ? "HT40" : "HT20")))),
-		((!bWifiBusy) ? "idle" : ((BTC_WIFI_TRAFFIC_TX == wifiTrafficDir) ? "uplink" : "downlink")),
+		((bWifiUnderBMode) ? "11b" : ((wifiBw == BTC_WIFI_BW_LEGACY) ? "11bg" : (((wifiBw == BTC_WIFI_BW_HT40) ? "HT40" : "HT20")))),
+		((!bWifiBusy) ? "idle" : ((wifiTrafficDir == BTC_WIFI_TRAFFIC_TX) ? "uplink" : "downlink")),
 		pCoexSta->nScanAPNum,
 		(pCoexSta->bCCKLock) ? "Lock" : "noLock"
 	);
@@ -2897,8 +2897,8 @@ void EXhalbtc8723b1ant_DisplayCoexInfo(PBTC_COEXIST pBtCoexist)
 		cliBuf,
 		BT_TMP_BUF_SIZE,
 		"\r\n %-35s = [%s/ %d/ %d/ %d] ", "BT [status/ rssi/ retryCnt/ popCnt]", \
-		((pBtCoexist->btInfo.bBtDisabled) ? ("disabled") : ((pCoexSta->bC2hBtInquiryPage) ? ("inquiry/page scan") : ((BT_8723B_1ANT_BT_STATUS_NON_CONNECTED_IDLE == pCoexDm->btStatus) ? "non-connected idle" :
-		((BT_8723B_1ANT_BT_STATUS_CONNECTED_IDLE == pCoexDm->btStatus) ? "connected-idle" : "busy")))),
+		((pBtCoexist->btInfo.bBtDisabled) ? ("disabled") : ((pCoexSta->bC2hBtInquiryPage) ? ("inquiry/page scan") : ((pCoexDm->btStatus == BT_8723B_1ANT_BT_STATUS_NON_CONNECTED_IDLE) ? "non-connected idle" :
+		((pCoexDm->btStatus == BT_8723B_1ANT_BT_STATUS_CONNECTED_IDLE) ? "connected-idle" : "busy")))),
 		pCoexSta->btRssi, pCoexSta->btRetryCnt, pCoexSta->popEventCnt
 	);
 	CL_PRINTF(cliBuf);
@@ -3188,7 +3188,7 @@ void EXhalbtc8723b1ant_IpsNotify(PBTC_COEXIST pBtCoexist, u8 type)
 	if (pBtCoexist->bManualControl ||	pBtCoexist->bStopCoexDm)
 		return;
 
-	if (BTC_IPS_ENTER == type) {
+	if (type == BTC_IPS_ENTER) {
 		BTC_PRINT(
 			BTC_MSG_INTERFACE, INTF_NOTIFY, ("[BTCoex], IPS ENTER notify\n")
 		);
@@ -3197,7 +3197,7 @@ void EXhalbtc8723b1ant_IpsNotify(PBTC_COEXIST pBtCoexist, u8 type)
 		halbtc8723b1ant_PsTdma(pBtCoexist, NORMAL_EXEC, false, 0);
 		halbtc8723b1ant_CoexTableWithType(pBtCoexist, NORMAL_EXEC, 0);
 		halbtc8723b1ant_SetAntPath(pBtCoexist, BTC_ANT_PATH_BT, false, true);
-	} else if (BTC_IPS_LEAVE == type) {
+	} else if (type == BTC_IPS_LEAVE) {
 		BTC_PRINT(
 			BTC_MSG_INTERFACE, INTF_NOTIFY, ("[BTCoex], IPS LEAVE notify\n")
 		);
@@ -3214,12 +3214,12 @@ void EXhalbtc8723b1ant_LpsNotify(PBTC_COEXIST pBtCoexist, u8 type)
 	if (pBtCoexist->bManualControl || pBtCoexist->bStopCoexDm)
 		return;
 
-	if (BTC_LPS_ENABLE == type) {
+	if (type == BTC_LPS_ENABLE) {
 		BTC_PRINT(
 			BTC_MSG_INTERFACE, INTF_NOTIFY, ("[BTCoex], LPS ENABLE notify\n")
 		);
 		pCoexSta->bUnderLps = true;
-	} else if (BTC_LPS_DISABLE == type) {
+	} else if (type == BTC_LPS_DISABLE) {
 		BTC_PRINT(
 			BTC_MSG_INTERFACE, INTF_NOTIFY, ("[BTCoex], LPS DISABLE notify\n")
 		);
@@ -3241,7 +3241,7 @@ void EXhalbtc8723b1ant_ScanNotify(PBTC_COEXIST pBtCoexist, u8 type)
 	if (pBtCoexist->bManualControl || pBtCoexist->bStopCoexDm)
 		return;
 
-	if (BTC_SCAN_START == type) {
+	if (type == BTC_SCAN_START) {
 		pCoexSta->bWiFiIsHighPriTask = true;
 		BTC_PRINT(
 			BTC_MSG_INTERFACE, INTF_NOTIFY, ("[BTCoex], SCAN START notify\n")
@@ -3302,13 +3302,13 @@ void EXhalbtc8723b1ant_ScanNotify(PBTC_COEXIST pBtCoexist, u8 type)
 		return;
 	}
 
-	if (BTC_SCAN_START == type) {
+	if (type == BTC_SCAN_START) {
 		/* BTC_PRINT(BTC_MSG_INTERFACE, INTF_NOTIFY, ("[BTCoex], SCAN START notify\n")); */
 		if (!bWifiConnected)	/*  non-connected scan */
 			halbtc8723b1ant_ActionWifiNotConnectedScan(pBtCoexist);
 		else	/*  wifi is connected */
 			halbtc8723b1ant_ActionWifiConnectedScan(pBtCoexist);
-	} else if (BTC_SCAN_FINISH == type) {
+	} else if (type == BTC_SCAN_FINISH) {
 		/* BTC_PRINT(BTC_MSG_INTERFACE, INTF_NOTIFY, ("[BTCoex], SCAN FINISH notify\n")); */
 		if (!bWifiConnected)	/*  non-connected scan */
 			halbtc8723b1ant_ActionWifiNotConnected(pBtCoexist);
@@ -3332,7 +3332,7 @@ void EXhalbtc8723b1ant_ConnectNotify(PBTC_COEXIST pBtCoexist, u8 type)
 	)
 		return;
 
-	if (BTC_ASSOCIATE_START == type) {
+	if (type == BTC_ASSOCIATE_START) {
 		pCoexSta->bWiFiIsHighPriTask = true;
 		BTC_PRINT(BTC_MSG_INTERFACE, INTF_NOTIFY, ("[BTCoex], CONNECT START notify\n"));
 		 pCoexDm->nArpCnt = 0;
@@ -3360,10 +3360,10 @@ void EXhalbtc8723b1ant_ConnectNotify(PBTC_COEXIST pBtCoexist, u8 type)
 		return;
 	}
 
-	if (BTC_ASSOCIATE_START == type) {
+	if (type == BTC_ASSOCIATE_START) {
 		/* BTC_PRINT(BTC_MSG_INTERFACE, INTF_NOTIFY, ("[BTCoex], CONNECT START notify\n")); */
 		halbtc8723b1ant_ActionWifiNotConnectedAssoAuth(pBtCoexist);
-	} else if (BTC_ASSOCIATE_FINISH == type) {
+	} else if (type == BTC_ASSOCIATE_FINISH) {
 		/* BTC_PRINT(BTC_MSG_INTERFACE, INTF_NOTIFY, ("[BTCoex], CONNECT FINISH notify\n")); */
 
 		pBtCoexist->fBtcGet(pBtCoexist, BTC_GET_BL_WIFI_CONNECTED, &bWifiConnected);
@@ -3388,7 +3388,7 @@ void EXhalbtc8723b1ant_MediaStatusNotify(PBTC_COEXIST pBtCoexist, u8 type)
 	)
 		return;
 
-	if (BTC_MEDIA_CONNECT == type) {
+	if (type == BTC_MEDIA_CONNECT) {
 		BTC_PRINT(BTC_MSG_INTERFACE, INTF_NOTIFY, ("[BTCoex], MEDIA connect notify\n"));
 
 		pBtCoexist->fBtcGet(pBtCoexist, BTC_GET_BL_WIFI_UNDER_B_MODE, &bWifiUnderBMode);
@@ -3416,13 +3416,13 @@ void EXhalbtc8723b1ant_MediaStatusNotify(PBTC_COEXIST pBtCoexist, u8 type)
 
 	/*  only 2.4G we need to inform bt the chnl mask */
 	pBtCoexist->fBtcGet(pBtCoexist, BTC_GET_U1_WIFI_CENTRAL_CHNL, &wifiCentralChnl);
-	if ((BTC_MEDIA_CONNECT == type) && (wifiCentralChnl <= 14)) {
+	if ((type BTC_MEDIA_CONNECT) && (wifiCentralChnl <= 14)) {
 		/* H2C_Parameter[0] = 0x1; */
 		H2C_Parameter[0] = 0x0;
 		H2C_Parameter[1] = wifiCentralChnl;
 		pBtCoexist->fBtcGet(pBtCoexist, BTC_GET_U4_WIFI_BW, &wifiBw);
 
-		if (BTC_WIFI_BW_HT40 == wifiBw)
+		if (wifiBw == BTC_WIFI_BW_HT40)
 			H2C_Parameter[2] = 0x30;
 		else
 			H2C_Parameter[2] = 0x20;
@@ -3460,11 +3460,11 @@ void EXhalbtc8723b1ant_SpecialPacketNotify(PBTC_COEXIST pBtCoexist, u8 type)
 		return;
 
 	if (
-		BTC_PACKET_DHCP == type ||
-		BTC_PACKET_EAPOL == type ||
-		BTC_PACKET_ARP == type
+		type == BTC_PACKET_DHCP ||
+		type == BTC_PACKET_EAPOL ||
+		type == BTC_PACKET_ARP
 	) {
-		if (BTC_PACKET_ARP == type) {
+		if (type == BTC_PACKET_ARP) {
 			BTC_PRINT(
 				BTC_MSG_INTERFACE,
 				INTF_NOTIFY,
@@ -3525,9 +3525,9 @@ void EXhalbtc8723b1ant_SpecialPacketNotify(PBTC_COEXIST pBtCoexist, u8 type)
 	}
 
 	if (
-		BTC_PACKET_DHCP == type ||
-		BTC_PACKET_EAPOL == type ||
-		((BTC_PACKET_ARP == type) && (pCoexSta->bWiFiIsHighPriTask))
+		type == BTC_PACKET_DHCP ||
+		type == BTC_PACKET_EAPOL ||
+		((type == BTC_PACKET_ARP) && (pCoexSta->bWiFiIsHighPriTask))
 	)
 		halbtc8723b1ant_ActionWifiConnectedSpecialPacket(pBtCoexist);
 }
@@ -3567,7 +3567,7 @@ void EXhalbtc8723b1ant_BtInfoNotify(
 			BTC_PRINT(BTC_MSG_INTERFACE, INTF_NOTIFY, ("0x%02x, ", tmpBuf[i]));
 	}
 
-	if (BT_INFO_SRC_8723B_1ANT_WIFI_FW != rspSource) {
+	if (rspSource != BT_INFO_SRC_8723B_1ANT_WIFI_FW) {
 		pCoexSta->btRetryCnt = pCoexSta->btInfoC2h[rspSource][2]&0xf;
 
 		if (pCoexSta->btRetryCnt >= 1)
@@ -3675,7 +3675,7 @@ void EXhalbtc8723b1ant_BtInfoNotify(
 		pCoexDm->btStatus = BT_8723B_1ANT_BT_STATUS_SCO_BUSY;
 		BTC_PRINT(BTC_MSG_ALGORITHM, ALGO_TRACE, ("[BTCoex], BtInfoNotify(), BT SCO busy!!!\n"));
 	} else if (btInfo&BT_INFO_8723B_1ANT_B_ACL_BUSY) {
-		if (BT_8723B_1ANT_BT_STATUS_ACL_BUSY != pCoexDm->btStatus)
+		if (pCoexDm->btStatus != BT_8723B_1ANT_BT_STATUS_ACL_BUSY)
 			pCoexDm->bAutoTdmaAdjust = false;
 
 		pCoexDm->btStatus = BT_8723B_1ANT_BT_STATUS_ACL_BUSY;
@@ -3686,9 +3686,9 @@ void EXhalbtc8723b1ant_BtInfoNotify(
 	}
 
 	if (
-		(BT_8723B_1ANT_BT_STATUS_ACL_BUSY == pCoexDm->btStatus) ||
-		(BT_8723B_1ANT_BT_STATUS_SCO_BUSY == pCoexDm->btStatus) ||
-		(BT_8723B_1ANT_BT_STATUS_ACL_SCO_BUSY == pCoexDm->btStatus)
+		(pCoexDm->btStatus == BT_8723B_1ANT_BT_STATUS_ACL_BUSY) ||
+		(pCoexDm->btStatus == BT_8723B_1ANT_BT_STATUS_SCO_BUSY) ||
+		(pCoexDm->btStatus == BT_8723B_1ANT_BT_STATUS_ACL_SCO_BUSY)
 	)
 		bBtBusy = true;
 	else
@@ -3717,7 +3717,7 @@ void EXhalbtc8723b1ant_PnpNotify(PBTC_COEXIST pBtCoexist, u8 pnpState)
 {
 	BTC_PRINT(BTC_MSG_INTERFACE, INTF_NOTIFY, ("[BTCoex], Pnp notify\n"));
 
-	if (BTC_WIFI_PNP_SLEEP == pnpState) {
+	if (pnpState == BTC_WIFI_PNP_SLEEP) {
 		BTC_PRINT(BTC_MSG_INTERFACE, INTF_NOTIFY, ("[BTCoex], Pnp notify to SLEEP\n"));
 
 		halbtc8723b1ant_PowerSaveState(pBtCoexist, BTC_PS_WIFI_NATIVE, 0x0, 0x0);
@@ -3726,7 +3726,7 @@ void EXhalbtc8723b1ant_PnpNotify(PBTC_COEXIST pBtCoexist, u8 pnpState)
 		halbtc8723b1ant_SetAntPath(pBtCoexist, BTC_ANT_PATH_BT, false, true);
 
 		pBtCoexist->bStopCoexDm = true;
-	} else if (BTC_WIFI_PNP_WAKE_UP == pnpState) {
+	} else if (pnpState == BTC_WIFI_PNP_WAKE_UP) {
 		BTC_PRINT(BTC_MSG_INTERFACE, INTF_NOTIFY, ("[BTCoex], Pnp notify to WAKE UP\n"));
 		pBtCoexist->bStopCoexDm = false;
 		halbtc8723b1ant_InitHwConfig(pBtCoexist, false, false);
drivers/staging/rtl8723bs/hal/HalBtc8723b2Ant.c +41 -41

281 lines not on this page · raw message

drivers/staging/rtl8723bs/hal/HalPhyRf_8723B.c +3 -3
index 85ea535dd6e9..549af7817b02 100644
@@ -373,7 +373,7 @@ static void GetDeltaSwingTable_8723B(
 	u16 rate = *(pDM_Odm->pForcedDataRate);
 	u8 channel = pHalData->CurrentChannel;
 
-	if (1 <= channel && channel <= 14) {
+	if (channel >= 1 && channel <= 14) {
 		if (IS_CCK_RATE(rate)) {
 			*TemperatureUP_A   = pRFCalibrateInfo->DeltaSwingTableIdx_2GCCKA_P;
 			*TemperatureDOWN_A = pRFCalibrateInfo->DeltaSwingTableIdx_2GCCKA_N;
@@ -1623,7 +1623,7 @@ static void phy_IQCalibrate_8723B(
 		}
 	}
 
-	if (0x00 == PathAOK) {
+	if (PathAOK == 0x00) {
 		ODM_RT_TRACE(pDM_Odm, ODM_COMP_CALIBRATION, ODM_DBG_LOUD, ("Path A IQK failed!!\n"));
 	}
 
@@ -1661,7 +1661,7 @@ static void phy_IQCalibrate_8723B(
 		}
 
 /* Allen end */
-		if (0x00 == PathBOK) {
+		if (PathBOK == 0x00) {
 			ODM_RT_TRACE(pDM_Odm, ODM_COMP_CALIBRATION, ODM_DBG_LOUD, ("Path B IQK failed!!\n"));
 		}
 	}
drivers/staging/rtl8723bs/hal/hal_btcoex.c +11 -11
index 3705a60a0546..c65672b98168 100644
@@ -169,7 +169,7 @@ static void halbtcoutsrc_LeaveLowPower(PBTC_COEXIST pBtCoexist)
 	stime = jiffies;
 	do {
 		ready = rtw_register_task_alive(padapter, BTCOEX_ALIVE);
-		if (_SUCCESS == ready)
+		if (ready == _SUCCESS)
 			break;
 
 		utime = jiffies_to_msecs(jiffies - stime);
@@ -761,7 +761,7 @@ static void halbtcoutsrc_WriteLocalReg1Byte(void *pBtcContext, u32 RegAddr, u8 D
 	PBTC_COEXIST		pBtCoexist = (PBTC_COEXIST)pBtcContext;
 	struct adapter *Adapter = pBtCoexist->Adapter;
 
-	if (BTC_INTF_SDIO == pBtCoexist->chipInterface)
+	if (pBtCoexist->chipInterface  == BTC_INTF_SDIO)
 		rtw_write8(Adapter, SDIO_LOCAL_BASE | RegAddr, Data);
 	else
 		rtw_write8(Adapter, RegAddr, Data);
@@ -1011,7 +1011,7 @@ void EXhalbtcoutsrc_IpsNotify(PBTC_COEXIST pBtCoexist, u8 type)
 	if (pBtCoexist->bManualControl)
 		return;
 
-	if (IPS_NONE == type)
+	if (type == IPS_NONE)
 		ipsType = BTC_IPS_LEAVE;
 	else
 		ipsType = BTC_IPS_ENTER;
@@ -1039,7 +1039,7 @@ void EXhalbtcoutsrc_LpsNotify(PBTC_COEXIST pBtCoexist, u8 type)
 	if (pBtCoexist->bManualControl)
 		return;
 
-	if (PS_MODE_ACTIVE == type)
+	if (type == PS_MODE_ACTIVE)
 		lpsType = BTC_LPS_DISABLE;
 	else
 		lpsType = BTC_LPS_ENABLE;
@@ -1116,7 +1116,7 @@ void EXhalbtcoutsrc_MediaStatusNotify(PBTC_COEXIST pBtCoexist, RT_MEDIA_STATUS m
 	if (pBtCoexist->bManualControl)
 		return;
 
-	if (RT_MEDIA_CONNECT == mediaStatus)
+	if (mediaStatus == RT_MEDIA_CONNECT)
 		mStatus = BTC_MEDIA_CONNECT;
 	else
 		mStatus = BTC_MEDIA_DISCONNECT;
@@ -1142,11 +1142,11 @@ void EXhalbtcoutsrc_SpecialPacketNotify(PBTC_COEXIST pBtCoexist, u8 pktType)
 	if (pBtCoexist->bManualControl)
 		return;
 
-	if (PACKET_DHCP == pktType) {
+	if (pktType == PACKET_DHCP) {
 		packetType = BTC_PACKET_DHCP;
-	} else if (PACKET_EAPOL == pktType) {
+	} else if (pktType == PACKET_EAPOL) {
 		packetType = BTC_PACKET_EAPOL;
-	} else if (PACKET_ARP == pktType) {
+	} else if (pktType == PACKET_ARP) {
 		packetType = BTC_PACKET_ARP;
 	} else {
 		return;
@@ -1235,13 +1235,13 @@ void EXhalbtcoutsrc_SetChipType(u8 chipType)
 
 void EXhalbtcoutsrc_SetAntNum(u8 type, u8 antNum)
 {
-	if (BT_COEX_ANT_TYPE_PG == type) {
+	if (type == BT_COEX_ANT_TYPE_PG) {
 		GLBtCoexist.boardInfo.pgAntNum = antNum;
 		GLBtCoexist.boardInfo.btdmAntNum = antNum;
-	} else if (BT_COEX_ANT_TYPE_ANTDIV == type) {
+	} else if (type == BT_COEX_ANT_TYPE_ANTDIV) {
 		GLBtCoexist.boardInfo.btdmAntNum = antNum;
 		/* GLBtCoexist.boardInfo.btdmAntPos = BTC_ANTENNA_AT_MAIN_PORT; */
-	} else if (BT_COEX_ANT_TYPE_DETECTED == type) {
+	} else if (type == BT_COEX_ANT_TYPE_DETECTED) {
 		GLBtCoexist.boardInfo.btdmAntNum = antNum;
 		/* GLBtCoexist.boardInfo.btdmAntPos = BTC_ANTENNA_AT_MAIN_PORT; */
 	}
drivers/staging/rtl8723bs/hal/hal_com.c +1 -1
index 02676da5c166..a5ce5fdd2480 100644
@@ -121,7 +121,7 @@ u8 hal_com_config_channel_plan(
 	pHalData->bDisableSWChannelPlan = false;
 	chnlPlan = def_channel_plan;
 
-	if (0xFF == hw_channel_plan)
+	if (hw_channel_plan == 0xFF)
 		AutoLoadFail = true;
 
 	if (!AutoLoadFail) {
drivers/staging/rtl8723bs/hal/hal_com_phycfg.c +28 -28

132 lines not on this page · raw message

drivers/staging/rtl8723bs/hal/odm.c +2 -2
index f2a9e95a1563..d6dd51aa446c 100644
@@ -1165,9 +1165,9 @@ bool ODM_RAStateCheck(
 	}
 
 	/*  Decide RATRState by RSSI. */
-	if (RSSI > HighRSSIThreshForRA)
+	if (HighRSSIThreshForRA < RSSI)
 		RATRState = DM_RATR_STA_HIGH;
-	else if (RSSI > LowRSSIThreshForRA)
+	else if (LowRSSIThreshForRA < RSSI)
 		RATRState = DM_RATR_STA_MIDDLE;
 	else
 		RATRState = DM_RATR_STA_LOW;
drivers/staging/rtl8723bs/hal/rtl8723b_cmd.c +1 -1
index fd2b74003faf..1a1404061068 100644
@@ -28,7 +28,7 @@ static u8 _is_fw_read_cmd_down(struct adapter *padapter, u8 msgbox_num)
 
 	do {
 		valid = rtw_read8(padapter, REG_HMETFR) & BIT(msgbox_num);
-		if (0 == valid) {
+		if (valid == 0) {
 			read_down = true;
 		}
 #ifdef CONFIG_WOWLAN
drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +23 -23

96 lines not on this page · raw message

drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c +1 -1
index 44799c4a9f35..28a4b5baed2e 100644
@@ -492,7 +492,7 @@ int rtl8723bs_xmit_thread(void *context)
 		if (signal_pending(current)) {
 			flush_signals(current);
 		}
-	} while (_SUCCESS == ret);
+	} while (ret == _SUCCESS);
 
 	complete(&pxmitpriv->SdioXmitTerminate);
 
drivers/staging/rtl8723bs/hal/sdio_halinit.c +2 -2
index e42d8c18e1ae..57f248f432f2 100644
@@ -778,7 +778,7 @@ static u32 rtl8723bs_hal_init(struct adapter *padapter)
 /* 	rtw_hal_disable_interrupt(padapter); */
 
 	ret = _InitPowerOn_8723BS(padapter);
-	if (_FAIL == ret) {
+	if (ret == _FAIL) {
 		RT_TRACE(_module_hci_hal_init_c_, _drv_err_, ("Failed to init Power On!\n"));
 		return _FAIL;
 	}
@@ -861,7 +861,7 @@ static u32 rtl8723bs_hal_init(struct adapter *padapter)
 
 	/*  init LLT after tx buffer boundary is defined */
 	ret = rtl8723b_InitLLTTable(padapter);
-	if (_SUCCESS != ret) {
+	if (ret != _SUCCESS) {
 		DBG_8192C("%s: Failed to init LLT Table!\n", __func__);
 		return _FAIL;
 	}
Signature · 1 line
2.25.1
#2 lore raw

Re: [Outreachy kernel] [PATCH 1/4] staging: rtl8723bs: hal: fix position of constant in comparison

drivers/staging/rtl8723bs/hal/HalBtc8723b1Ant.c static bool halbtc8723b1ant_IsCommonAction(PBTC_COEXIST pBtCoexist) · line 1674

Quoted 7 lines · Amarjargal Gundjalam
drivers/staging/rtl8723bs/hal/HalBtc8723b1Ant.c +1 -1
@@ -1670,7 +1670,7 @@ static bool halbtc8723b1ant_IsCommonAction(PBTC_COEXIST pBtCoexist)
 
 	if (
 		!bWifiConnected &&
-		BT_8723B_1ANT_BT_STATUS_NON_CONNECTED_IDLE == pCoexDm->btStatus
+		pCoexDm->btStatus == BT_8723B_1ANT_BT_STATUS_NON_CONNECTED_IDLE
 	) {

While you're touching this, please reformat as:

	if (!bWifiConnected &&
	    pCoexDm->btStatus == BT_8723B_1ANT_BT_STATUS_NON_CONNECTED_IDLE) {

... fixing the name of that stupid constant is probably out of scope.

#3 lore raw

Re: [Outreachy kernel] [PATCH 1/4] staging: rtl8723bs: hal: fix position of constant in comparison

Quoted 14 lines · Matthew Wilcox
Quoted 10 lines · Amarjargal Gundjalam
drivers/staging/rtl8723bs/hal/HalBtc8723b1Ant.c +0 -1
@@ -1670,7 +1670,7 @@ static bool
 halbtc8723b1ant_IsCommonAction(PBTC_COEXIST pBtCoexist)
 
 	if (
 		!bWifiConnected &&
-		BT_8723B_1ANT_BT_STATUS_NON_CONNECTED_IDLE == pCoexDm-
Quoted 1 line

btStatus

(quoted diff) +1 -0
+		pCoexDm->btStatus ==

BT_8723B_1ANT_BT_STATUS_NON_CONNECTED_IDLE
) {

While you're touching this, please reformat as:

Quoted 6 lines
	if (!bWifiConnected &&
	    pCoexDm->btStatus ==

BT_8723B_1ANT_BT_STATUS_NON_CONNECTED_IDLE) {

... fixing the name of that stupid constant is probably out of scope.

Sure, I can work on it. Can I do this in a separate patch? This driver has lots of namings like this and I'd like to do single type of changes in each patch. And do you also have any suggestions on what could be the best way to shorten these constants?

#4 lore raw

Re: [Outreachy kernel] [PATCH 1/4] staging: rtl8723bs: hal: fix position of constant in comparison

Quoted 24 lines · Amarjargal Gundjalam
Quoted 15 lines · Matthew Wilcox
Quoted 10 lines · Amarjargal Gundjalam
drivers/staging/rtl8723bs/hal/HalBtc8723b1Ant.c +0 -1
@@ -1670,7 +1670,7 @@ static bool
 halbtc8723b1ant_IsCommonAction(PBTC_COEXIST pBtCoexist)
 
 	if (
 		!bWifiConnected &&
-		BT_8723B_1ANT_BT_STATUS_NON_CONNECTED_IDLE == pCoexDm-
Quoted 1 line

btStatus

(quoted diff) +1 -0
+		pCoexDm->btStatus ==

BT_8723B_1ANT_BT_STATUS_NON_CONNECTED_IDLE
) {

While you're touching this, please reformat as:

Quoted 7 lines
	if (!bWifiConnected &&
	    pCoexDm->btStatus ==

BT_8723B_1ANT_BT_STATUS_NON_CONNECTED_IDLE) {

... fixing the name of that stupid constant is probably out of scope.

Quoted 7 lines

Sure, I can work on it. Can I do this in a separate patch? This driver
has lots of namings like this and I'd like to do single type of changes
in each patch. And do you also have any suggestions on what could be the best way to shorten these constants?

Oops, it was not about shortening the name but reformatting it. Got it. Should I do this in a separate patch or modify this one?

#5 lore raw

Re: [Outreachy kernel] [PATCH 1/4] staging: rtl8723bs: hal: fix position of constant in comparison

Quoted 33 lines · Amarjargal Gundjalam
Quoted 24 lines · Amarjargal Gundjalam
Quoted 15 lines · Matthew Wilcox
Quoted 10 lines · Amarjargal Gundjalam
drivers/staging/rtl8723bs/hal/HalBtc8723b1Ant.c +0 -1
@@ -1670,7 +1670,7 @@ static bool
 halbtc8723b1ant_IsCommonAction(PBTC_COEXIST pBtCoexist)
 
 	if (
 		!bWifiConnected &&
-		BT_8723B_1ANT_BT_STATUS_NON_CONNECTED_IDLE == pCoexDm-
Quoted 1 line

btStatus

(quoted diff) +1 -0
+		pCoexDm->btStatus ==

BT_8723B_1ANT_BT_STATUS_NON_CONNECTED_IDLE
) {

While you're touching this, please reformat as:

Quoted 7 lines
	if (!bWifiConnected &&
	    pCoexDm->btStatus ==

BT_8723B_1ANT_BT_STATUS_NON_CONNECTED_IDLE) {

... fixing the name of that stupid constant is probably out of scope.

Quoted 7 lines

Sure, I can work on it. Can I do this in a separate patch? This driver
has lots of namings like this and I'd like to do single type of changes
in each patch. And do you also have any suggestions on what could be the best way to shorten these constants?

Quoted 2 lines

Oops, it was not about shortening the name but reformatting it. Got it. Should I do this in a separate patch or modify this one?

In general, each patch should do only one thing. But adjusting whitespace on the lines that you are already changing should be ok for just one patch. If there are lots of occurrences of this strange spacing in the whole file and you want to fix all of them, that would be a separate patch.

julia

Quoted 6 lines

--
You received this message because you are subscribed to the Google Groups "outreachy-kernel" group.
To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. To view this discussion on the web visit https://groups.google.com/d/msgid/outreachy-kernel/687cd3942fcefbd153d318bf0d7014ff01f0bce3.camel%40gmail.com.

#6 lore raw

PATCH 2/4 staging: rtl8723bs: hal: fix space before tabs and at the start of line

In reply to Amarjargal Gundjalam

Fix following checkpatch warnings:
WARNING: please, no spaces at the start of a line
WARNING: please, no space before tabs

---
 drivers/staging/rtl8723bs/hal/Hal8723BReg.h   |  30 +--
 .../staging/rtl8723bs/hal/HalBtc8723b1Ant.c   |  22 +--
 .../staging/rtl8723bs/hal/HalBtc8723b2Ant.c   |  26 +--
 drivers/staging/rtl8723bs/hal/HalBtcOutSrc.h  |   2 +-
 .../staging/rtl8723bs/hal/HalPhyRf_8723B.c    | 182 +++++++++---------
 drivers/staging/rtl8723bs/hal/hal_btcoex.c    |  70 +++----
 drivers/staging/rtl8723bs/hal/hal_com.c       |  24 +--
 drivers/staging/rtl8723bs/hal/odm.h           |  22 +--
 drivers/staging/rtl8723bs/hal/odm_debug.c     |  46 ++---
 drivers/staging/rtl8723bs/hal/rtl8723b_cmd.c  |  38 ++--
 drivers/staging/rtl8723bs/hal/rtl8723b_dm.c   |   4 +-
 .../staging/rtl8723bs/hal/rtl8723b_hal_init.c |  86 ++++-----
 .../staging/rtl8723bs/hal/rtl8723b_phycfg.c   |  36 ++--
 .../staging/rtl8723bs/hal/rtl8723bs_recv.c    |  14 +-
 .../staging/rtl8723bs/hal/rtl8723bs_xmit.c    |   6 +-
 drivers/staging/rtl8723bs/hal/sdio_halinit.c  |  72 +++----
 16 files changed, 340 insertions(+), 340 deletions(-)
drivers/staging/rtl8723bs/hal/Hal8723BReg.h +15 -15
index b9aca99478db..d0f4cbab86ca 100644
@@ -27,7 +27,7 @@
 
 /*  */
 /*  */
-/* 	0x0000h ~ 0x00FFh	System Configuration */
+/*	0x0000h ~ 0x00FFh	System Configuration */
 /*  */
 /*  */
 #define REG_SYS_ISO_CTRL_8723B			0x0000	/*  2 Byte */
@@ -84,7 +84,7 @@
 
 /*  */
 /*  */
-/* 	0x0100h ~ 0x01FFh	MACTOP General Configuration */
+/*	0x0100h ~ 0x01FFh	MACTOP General Configuration */
 /*  */
 /*  */
 #define REG_CR_8723B						0x0100
@@ -131,7 +131,7 @@
 
 /*  */
 /*  */
-/* 	0x0200h ~ 0x027Fh	TXDMA Configuration */
+/*	0x0200h ~ 0x027Fh	TXDMA Configuration */
 /*  */
 /*  */
 #define REG_RQPN_8723B					0x0200
@@ -145,7 +145,7 @@
 
 /*  */
 /*  */
-/* 	0x0280h ~ 0x02FFh	RXDMA Configuration */
+/*	0x0280h ~ 0x02FFh	RXDMA Configuration */
 /*  */
 /*  */
 #define REG_RXDMA_AGG_PG_TH_8723B		0x0280
@@ -161,7 +161,7 @@
 
 /*  */
 /*  */
-/* 	0x0300h ~ 0x03FFh	PCIe */
+/*	0x0300h ~ 0x03FFh	PCIe */
 /*  */
 /*  */
 #define	REG_PCIE_CTRL_REG_8723B		0x0300
@@ -189,7 +189,7 @@
 /*  spec version 11 */
 /*  */
 /*  */
-/* 	0x0400h ~ 0x047Fh	Protocol Configuration */
+/*	0x0400h ~ 0x047Fh	Protocol Configuration */
 /*  */
 /*  */
 #define REG_VOQ_INFORMATION_8723B		0x0400
@@ -243,7 +243,7 @@
 
 /*  */
 /*  */
-/* 	0x0500h ~ 0x05FFh	EDCA Configuration */
+/*	0x0500h ~ 0x05FFh	EDCA Configuration */
 /*  */
 /*  */
 #define REG_EDCA_VO_PARAM_8723B		0x0500
@@ -263,14 +263,14 @@
 #define REG_RD_CTRL_8723B				0x0524
 /*  */
 /*  Format for offset 540h-542h: */
-/* 	[3:0]:   TBTT prohibit setup in unit of 32us. The time for HW getting beacon content before TBTT. */
-/* 	[7:4]:   Reserved. */
-/* 	[19:8]:  TBTT prohibit hold in unit of 32us. The time for HW holding to send the beacon packet. */
-/* 	[23:20]: Reserved */
+/*	[3:0]:   TBTT prohibit setup in unit of 32us. The time for HW getting beacon content before TBTT. */
+/*	[7:4]:   Reserved. */
+/*	[19:8]:  TBTT prohibit hold in unit of 32us. The time for HW holding to send the beacon packet. */
+/*	[23:20]: Reserved */
 /*  Description: */
-/* 	              | */
+/*	              | */
 /*      |<--Setup--|--Hold------------>| */
-/* 	--------------|---------------------- */
+/*	--------------|---------------------- */
 /*                 | */
 /*                TBTT */
 /*  Note: We cannot update beacon content to HW or send any AC packets during the time between Setup and Hold. */
@@ -300,7 +300,7 @@
 #define REG_ACMHWCTRL_8723B		0x05C0
 #define REG_SCH_TXCMD_8723B		0x05F8
 
-/* 	0x0600h ~ 0x07FFh	WMAC Configuration */
+/*	0x0600h ~ 0x07FFh	WMAC Configuration */
 #define REG_MAC_CR_8723B		0x0600
 #define REG_TCR_8723B			0x0604
 #define REG_RCR_8723B			0x0608
@@ -356,7 +356,7 @@
 #define REG_SND_PTCL_CTRL_8723B		0x0718
 
 
-/* 	Redifine 8192C register definition for compatibility */
+/*	Redifine 8192C register definition for compatibility */
 
 /*  TODO: use these definition when using REG_xxx naming rule. */
 /*  NOTE: DO NOT Remove these definition. Use later. */
drivers/staging/rtl8723bs/hal/HalBtc8723b1Ant.c +11 -11
index 82ace6ceca15..33ef0d852115 100644
@@ -297,7 +297,7 @@ static void halbtc8723b1ant_LimitedRx(
 	u8 rxAggSize = aggBufSize;
 
 	/*  */
-	/* 	Rx Aggregation related setting */
+	/*	Rx Aggregation related setting */
 	/*  */
 	pBtCoexist->fBtcSet(
 		pBtCoexist, BTC_SET_BL_TO_REJ_AP_AGG_PKT, &bRejectRxAgg
@@ -316,7 +316,7 @@ static void halbtc8723b1ant_LimitedRx(
 
 static void halbtc8723b1ant_QueryBtInfo(PBTC_COEXIST pBtCoexist)
 {
-	u8 	H2C_Parameter[1] = {0};
+	u8	H2C_Parameter[1] = {0};
 
 	pCoexSta->bC2hBtInfoReqSent = true;
 
@@ -808,7 +808,7 @@ static void halbtc8723b1ant_SetSwPenaltyTxRateAdaptive(
 	PBTC_COEXIST pBtCoexist, bool bLowPenaltyRa
 )
 {
-	u8 	H2C_Parameter[6] = {0};
+	u8	H2C_Parameter[6] = {0};
 
 	H2C_Parameter[0] = 0x6;	/*  opCode, 0x6 = Retry_Penalty */
 
@@ -1369,10 +1369,10 @@ static void halbtc8723b1ant_PsTdma(
 	u8 rssiAdjustVal = 0;
 	u8 psTdmaByte4Val = 0x50, psTdmaByte0Val = 0x51, psTdmaByte3Val =  0x10;
 	s8 nWiFiDurationAdjust = 0x0;
-	/* u32 		fwVer = 0; */
+	/* u32		fwVer = 0; */
 
 	/* BTC_PRINT(BTC_MSG_ALGORITHM, ALGO_TRACE_FW, ("[BTCoex], %s turn %s PS TDMA, type =%d\n", */
-	/* 	(bForceExec? "force to":""), (bTurnOn? "ON":"OFF"), type)); */
+	/*	(bForceExec? "force to":""), (bTurnOn? "ON":"OFF"), type)); */
 	pCoexDm->bCurPsTdmaOn = bTurnOn;
 	pCoexDm->curPsTdma = type;
 
@@ -1812,7 +1812,7 @@ static void halbtc8723b1ant_TdmaDurationAdjustForAcl(
 		btInfoExt = pCoexSta->btInfoExt;
 		/* BTC_PRINT(BTC_MSG_ALGORITHM, ALGO_TRACE_FW_DETAIL, ("[BTCoex], retryCount = %d\n", retryCount)); */
 		/* BTC_PRINT(BTC_MSG_ALGORITHM, ALGO_TRACE_FW_DETAIL, ("[BTCoex], up =%d, dn =%d, m =%d, n =%d, WaitCount =%d\n", */
-		/* 	up, dn, m, n, WaitCount)); */
+		/*	up, dn, m, n, WaitCount)); */
 
 		if (pCoexSta->lowPriorityTx > 1050 || pCoexSta->lowPriorityRx > 1250)
 			retryCount++;
@@ -2002,13 +2002,13 @@ static void halbtc8723b1ant_PowerSaveState(
 
 /*  */
 /*  */
-/* 	Software Coex Mechanism start */
+/*	Software Coex Mechanism start */
 /*  */
 /*  */
 
 /*  */
 /*  */
-/* 	Non-Software Coex Mechanism start */
+/*	Non-Software Coex Mechanism start */
 /*  */
 /*  */
 static void halbtc8723b1ant_ActionWifiMultiPort(PBTC_COEXIST pBtCoexist)
@@ -2668,9 +2668,9 @@ void EXhalbtc8723b1ant_PowerOnSetting(PBTC_COEXIST pBtCoexist)
 	/*  */
 	/*  S0 or S1 setting and Local register setting(By the setting fw can get ant number, S0/S1, ... info) */
 	/*  Local setting bit define */
-	/* 	BIT0: "0" for no antenna inverse; "1" for antenna inverse */
-	/* 	BIT1: "0" for internal switch; "1" for external switch */
-	/* 	BIT2: "0" for one antenna; "1" for two antenna */
+	/*	BIT0: "0" for no antenna inverse; "1" for antenna inverse */
+	/*	BIT1: "0" for internal switch; "1" for external switch */
+	/*	BIT2: "0" for one antenna; "1" for two antenna */
 	/*  NOTE: here default all internal switch and 1-antenna ==> BIT1 = 0 and BIT2 = 0 */
 	if (pBtCoexist->chipInterface == BTC_INTF_USB) {
 		/*  fixed at S0 for USB interface */
drivers/staging/rtl8723bs/hal/HalBtc8723b2Ant.c +13 -13
index 1107cc97494d..1f5df0c7131a 100644
@@ -201,7 +201,7 @@ static void halbtc8723b2ant_LimitedRx(
 	u8 rxAggSize = aggBufSize;
 
 	/*  */
-	/* 	Rx Aggregation related setting */
+	/*	Rx Aggregation related setting */
 	/*  */
 	pBtCoexist->fBtcSet(pBtCoexist, BTC_SET_BL_TO_REJ_AP_AGG_PKT, &bRejectRxAgg);
 	/*  decide BT control aggregation buf size or not */
@@ -264,7 +264,7 @@ static void halbtc8723b2ant_MonitorBtCtr(PBTC_COEXIST pBtCoexist)
 
 static void halbtc8723b2ant_QueryBtInfo(PBTC_COEXIST pBtCoexist)
 {
-	u8 	H2C_Parameter[1] = {0};
+	u8 H2C_Parameter[1] = {0};
 
 	pCoexSta->bC2hBtInfoReqSent = true;
 
@@ -552,7 +552,7 @@ static void halbtc8723b2ant_SetFwDacSwingLevel(
 	PBTC_COEXIST pBtCoexist, u8 dacSwingLvl
 )
 {
-	u8 	H2C_Parameter[1] = {0};
+	u8 H2C_Parameter[1] = {0};
 
 	/*  There are several type of dacswing */
 	/*  0x18/ 0x10/ 0xc/ 0x8/ 0x4/ 0x6 */
@@ -576,7 +576,7 @@ static void halbtc8723b2ant_SetFwDecBtPwr(
 	PBTC_COEXIST pBtCoexist, u8 decBtPwrLvl
 )
 {
-	u8 	H2C_Parameter[1] = {0};
+	u8 H2C_Parameter[1] = {0};
 
 	H2C_Parameter[0] = decBtPwrLvl;
 
@@ -723,7 +723,7 @@ static void halbtc8723b2ant_SetSwPenaltyTxRateAdaptive(
 	PBTC_COEXIST pBtCoexist, bool bLowPenaltyRa
 )
 {
-	u8 	H2C_Parameter[6] = {0};
+	u8 H2C_Parameter[6] = {0};
 
 	H2C_Parameter[0] = 0x6;	/*  opCode, 0x6 = Retry_Penalty */
 
@@ -1099,7 +1099,7 @@ static void halbtc8723b2ant_SetFwIgnoreWlanAct(
 	PBTC_COEXIST pBtCoexist, bool bEnable
 )
 {
-	u8 	H2C_Parameter[1] = {0};
+	u8 H2C_Parameter[1] = {0};
 
 	if (bEnable)
 		H2C_Parameter[0] |= BIT0;		/*  function enable */
@@ -1153,7 +1153,7 @@ static void halbtc8723b2ant_SetFwPstdma(
 	u8 byte5
 )
 {
-	u8 	H2C_Parameter[5] = {0};
+	u8 H2C_Parameter[5] = {0};
 
 	H2C_Parameter[0] = byte1;
 	H2C_Parameter[1] = byte2;
@@ -1215,7 +1215,7 @@ static void halbtc8723b2ant_SetAntPath(
 	u32 fwVer = 0, u4Tmp = 0;
 	bool bPgExtSwitch = false;
 	bool bUseExtSwitch = false;
-	u8 	H2C_Parameter[2] = {0};
+	u8 H2C_Parameter[2] = {0};
 
 	pBtCoexist->fBtcGet(pBtCoexist, BTC_GET_BL_EXT_SWITCH, &bPgExtSwitch);
 	pBtCoexist->fBtcGet(pBtCoexist, BTC_GET_U4_WIFI_FW_VER, &fwVer);	/*  [31:16]=fw ver, [15:0]=fw sub ver */
@@ -2834,9 +2834,9 @@ void EXhalbtc8723b2ant_PowerOnSetting(PBTC_COEXIST pBtCoexist)
 	/*  */
 	/*  S0 or S1 setting and Local register setting(By the setting fw can get ant number, S0/S1, ... info) */
 	/*  Local setting bit define */
-	/* 	BIT0: "0" for no antenna inverse; "1" for antenna inverse */
-	/* 	BIT1: "0" for internal switch; "1" for external switch */
-	/* 	BIT2: "0" for one antenna; "1" for two antenna */
+	/*	BIT0: "0" for no antenna inverse; "1" for antenna inverse */
+	/*	BIT1: "0" for internal switch; "1" for external switch */
+	/*	BIT2: "0" for one antenna; "1" for two antenna */
 	/*  NOTE: here default all internal switch and 1-antenna ==> BIT1 = 0 and BIT2 = 0 */
 	if (pBtCoexist->chipInterface == BTC_INTF_USB) {
 		/*  fixed at S0 for USB interface */
@@ -3362,8 +3362,8 @@ void EXhalbtc8723b2ant_BtInfoNotify(
 	PBTC_COEXIST pBtCoexist, u8 *tmpBuf, u8 length
 )
 {
-	u8 	btInfo = 0;
-	u8 	i, rspSource = 0;
+	u8 btInfo = 0;
+	u8 i, rspSource = 0;
 	bool bBtBusy = false, bLimitedDig = false;
 	bool bWifiConnected = false;
 
drivers/staging/rtl8723bs/hal/HalBtcOutSrc.h +1 -1
index c758d143c57f..aa840613acab 100644
@@ -83,7 +83,7 @@ typedef enum _BTC_MSG_TYPE {
 	BTC_MSG_ALGORITHM	= 0x1,
 	BTC_MSG_MAX
 } BTC_MSG_TYPE;
-extern u32 		GLBtcDbgType[];
+extern u32		GLBtcDbgType[];
 
 /*  following is for BTC_MSG_INTERFACE */
 #define INTF_INIT	BIT0
drivers/staging/rtl8723bs/hal/HalPhyRf_8723B.c +91 -91

541 lines not on this page · raw message

drivers/staging/rtl8723bs/hal/hal_btcoex.c +35 -35

205 lines not on this page · raw message

drivers/staging/rtl8723bs/hal/hal_com.c +12 -12
index a5ce5fdd2480..bda4ca01e374 100644
@@ -767,7 +767,7 @@ static void _TwoOutPipeMapping(struct adapter *padapter, bool bWIFICfg)
 
 	if (bWIFICfg) { /* WMM */
 
-		/* 	BK,	BE,	VI,	VO,	BCN,	CMD, MGT, HIGH, HCCA */
+		/*	BK,	BE,	VI,	VO,	BCN,	CMD, MGT, HIGH, HCCA */
 		/*   0,		1,	0,	1,	0,	0,	0,	0,		0	}; */
 		/* 0:ep_0 num, 1:ep_1 num */
 
@@ -808,7 +808,7 @@ static void _ThreeOutPipeMapping(struct adapter *padapter, bool bWIFICfg)
 
 	if (bWIFICfg) { /* for WMM */
 
-		/* 	BK,	BE,	VI,	VO,	BCN,	CMD, MGT, HIGH, HCCA */
+		/*	BK,	BE,	VI,	VO,	BCN,	CMD, MGT, HIGH, HCCA */
 		/*   1,		2,	1,	0,	0,	0,	0,	0,		0	}; */
 		/* 0:H, 1:N, 2:L */
 
@@ -825,7 +825,7 @@ static void _ThreeOutPipeMapping(struct adapter *padapter, bool bWIFICfg)
 	} else { /* typical setting */
 
 
-		/* 	BK,	BE,	VI,	VO,	BCN,	CMD, MGT, HIGH, HCCA */
+		/*	BK,	BE,	VI,	VO,	BCN,	CMD, MGT, HIGH, HCCA */
 		/*   2,		2,	1,	0,	0,	0,	0,	0,		0	}; */
 		/* 0:H, 1:N, 2:L */
 
@@ -1351,9 +1351,9 @@ bool eqNByte(u8 *str1, u8 *str2, u32 num)
 }
 
 /*  */
-/* 	Description: */
-/* 		Return true if chTmp is represent for hex digit and */
-/* 		false otherwise. */
+/*	Description: */
+/*		Return true if chTmp is represent for hex digit and */
+/*		false otherwise. */
 /*  */
 /*  */
 bool IsHexDigit(char chTmp)
@@ -1370,8 +1370,8 @@ bool IsHexDigit(char chTmp)
 
 
 /*  */
-/* 	Description: */
-/* 		Translate a character to hex digit. */
+/*	Description: */
+/*		Translate a character to hex digit. */
 /*  */
 u32 MapCharToHexDigit(char chTmp)
 {
@@ -1387,8 +1387,8 @@ u32 MapCharToHexDigit(char chTmp)
 
 
 
-/* 	Description: */
-/* 		Parse hex number from the string pucStr. */
+/*	Description: */
+/*		Parse hex number from the string pucStr. */
 bool GetHexValueFromString(char *szStr, u32 *pu4bVal, u32 *pu4bMove)
 {
 	char *szScan = szStr;
@@ -1477,8 +1477,8 @@ bool GetFractionValueFromString(
 }
 
 /*  */
-/* 	Description: */
-/* 		Return true if szStr is comment out with leading "//". */
+/*	Description: */
+/*		Return true if szStr is comment out with leading "//". */
 /*  */
 bool IsCommentString(char *szStr)
 {
drivers/staging/rtl8723bs/hal/odm.h +11 -11
index 16e8f66a3171..cf3059213545 100644
@@ -315,8 +315,8 @@ typedef struct _ODM_STA_INFO {
 	/* TX_INFO_T		pTxInfo;		Define in IC folder. Move lower layer. */
 
 	/*  */
-	/* 	Please use compile flag to disabe the strcutrue for other IC except 88E. */
-	/* 	Move To lower layer. */
+	/*	Please use compile flag to disabe the strcutrue for other IC except 88E. */
+	/*	Move To lower layer. */
 	/*  */
 	/*  ODM Write Wilson will handle this part(said by Luke.Lee) */
 	/* TX_RPT_T		pTxRpt;			Define in IC folder. Move lower layer. */
@@ -445,7 +445,7 @@ typedef enum _ODM_Support_Ability_Definition {
 	ODM_RF_CALIBRATION		= BIT26,
 } ODM_ABILITY_E;
 
-/* 	ODM_CMNINFO_INTERFACE */
+/*	ODM_CMNINFO_INTERFACE */
 typedef enum tag_ODM_Support_Interface_Definition {
 	ODM_ITRF_SDIO	=	0x4,
 	ODM_ITRF_ALL	=	0x7,
@@ -508,9 +508,9 @@ typedef enum tag_ODM_RF_Type_Definition {
 /*  */
 
 /* typedef enum _MACPHY_MODE_8192D{ */
-/* 	SINGLEMAC_SINGLEPHY, */
-/* 	DUALMAC_DUALPHY, */
-/* 	DUALMAC_SINGLEPHY, */
+/*	SINGLEMAC_SINGLEPHY, */
+/*	DUALMAC_DUALPHY, */
+/*	DUALMAC_SINGLEPHY, */
 /* MACPHY_MODE_8192D,*PMACPHY_MODE_8192D; */
 /*  Above is the original define in MP driver. Please use the same define. THX. */
 typedef enum tag_ODM_MAC_PHY_Mode_Definition {
@@ -870,7 +870,7 @@ typedef struct _ANT_DETECTED_INFO {
 typedef  struct DM_Out_Source_Dynamic_Mechanism_Structure {
 	/* RT_TIMER	FastAntTrainingTimer; */
 	/*  */
-	/* 	Add for different team use temporarily */
+	/*	Add for different team use temporarily */
 	/*  */
 	struct adapter *Adapter;		/*  For CE/NIC team */
 	/*  WHen you use Adapter or priv pointer, you must make sure the pointer is ready. */
@@ -895,10 +895,10 @@ typedef  struct DM_Out_Source_Dynamic_Mechanism_Structure {
 /*  ODM HANDLE, DRIVER NEEDS NOT TO HOOK------ */
 
 /* REMOVED COMMON INFO---------- */
-	/* u8 		PseudoMacPhyMode; */
+	/* u8			PseudoMacPhyMode; */
 	/* bool			*BTCoexist; */
 	/* bool			PseudoBtCoexist; */
-	/* u8 		OPMode; */
+	/* u8			OPMode; */
 	/* bool			bAPMode; */
 	/* bool			bClientMode; */
 	/* bool			bAdHocMode; */
@@ -992,7 +992,7 @@ typedef  struct DM_Out_Source_Dynamic_Mechanism_Structure {
 	u8 *pAntennaTest;
 	bool *pbNet_closed;
 	u8 *mp_mode;
-	/* u8 	*pAidMap; */
+	/* u8 *pAidMap; */
 	u8 *pu1ForcedIgiLb;
 /*  For 8723B IQK----------- */
 	bool *pIs1Antenna;
@@ -1226,7 +1226,7 @@ typedef enum _ODM_RF_RADIO_PATH {
 	/*   ODM_RF_PATH_MAX,    Max RF number 90 support */
 } ODM_RF_RADIO_PATH_E, *PODM_RF_RADIO_PATH_E;
 
- typedef enum _ODM_RF_CONTENT {
+typedef enum _ODM_RF_CONTENT {
 	odm_radioa_txt = 0x1000,
 	odm_radiob_txt = 0x1001,
 	odm_radioc_txt = 0x1002,
drivers/staging/rtl8723bs/hal/odm_debug.c +23 -23

55 lines not on this page · raw message

drivers/staging/rtl8723bs/hal/rtl8723b_cmd.c +19 -19
index 1a1404061068..20b4173bd0fc 100644
@@ -92,7 +92,7 @@ s32 FillH2CCmd8723B(struct adapter *padapter, u8 ElementID, u32 CmdLen, u8 *pCmd
 		else {
 			memcpy((u8 *)(&h2c_cmd)+1, pCmdBuffer, 3);
 			memcpy((u8 *)(&h2c_cmd_ex), pCmdBuffer+3, CmdLen-3);
-/* 			*(u8 *)(&h2c_cmd) |= BIT(7); */
+/*			*(u8 *)(&h2c_cmd) |= BIT(7); */
 		}
 
 		*(u8 *)(&h2c_cmd) |= ElementID;
@@ -105,7 +105,7 @@ s32 FillH2CCmd8723B(struct adapter *padapter, u8 ElementID, u32 CmdLen, u8 *pCmd
 		rtw_write32(padapter, msgbox_addr, h2c_cmd);
 
 		/* DBG_8192C("MSG_BOX:%d, CmdLen(%d), CmdID(0x%x), reg:0x%x =>h2c_cmd:0x%.8x, reg:0x%x =>h2c_cmd_ex:0x%.8x\n" */
-		/* 	, pHalData->LastHMEBoxNum , CmdLen, ElementID, msgbox_addr, h2c_cmd, msgbox_ex_addr, h2c_cmd_ex); */
+		/*	, pHalData->LastHMEBoxNum , CmdLen, ElementID, msgbox_addr, h2c_cmd, msgbox_ex_addr, h2c_cmd_ex); */
 
 		pHalData->LastHMEBoxNum = (h2c_box_num+1) % MAX_H2C_BOX_NUMS;
 
@@ -320,7 +320,7 @@ static void ConstructNullFunctionData(
 #ifdef CONFIG_WOWLAN
 /*  */
 /*  Description: */
-/* 	Construct the ARP response packet to support ARP offload. */
+/*	Construct the ARP response packet to support ARP offload. */
 /*  */
 static void ConstructARPResponse(
 	struct adapter *padapter,
@@ -334,11 +334,11 @@ static void ConstructARPResponse(
 	struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv);
 	struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
 	struct security_priv *psecuritypriv = &padapter->securitypriv;
-	static u8 	ARPLLCHeader[8] = {0xAA, 0xAA, 0x03, 0x00, 0x00, 0x00, 0x08, 0x06};
-	u8 		*pARPRspPkt = pframe;
+	static u8 ARPLLCHeader[8] = {0xAA, 0xAA, 0x03, 0x00, 0x00, 0x00, 0x08, 0x06};
+	u8 *pARPRspPkt = pframe;
 	/* for TKIP Cal MIC */
-	u8 		*payload = pframe;
-	u8 	EncryptionHeadOverhead = 0;
+	u8 *payload = pframe;
+	u8 EncryptionHeadOverhead = 0;
 	/* DBG_871X("%s:%d\n", __func__, bForcePowerSave); */
 
 	pwlanhdr = (struct ieee80211_hdr *)pframe;
@@ -1497,7 +1497,7 @@ static void rtl8723b_set_FwRsvdPagePkt(
 	rtl8723b_fill_fake_txdesc(padapter, &ReservedPagePacket[BufIndex-TxDescLen], PSPollLength, true, false, false);
 
 	/* DBG_871X("%s(): HW_VAR_SET_TX_CMD: PS-POLL %p %d\n", */
-	/* 	__func__, &ReservedPagePacket[BufIndex-TxDescLen], (PSPollLength+TxDescLen)); */
+	/*	__func__, &ReservedPagePacket[BufIndex-TxDescLen], (PSPollLength+TxDescLen)); */
 
 	CurtPktPageNum = (u8)PageNum_128(TxDescLen + PSPollLength);
 
@@ -1517,7 +1517,7 @@ static void rtl8723b_set_FwRsvdPagePkt(
 	rtl8723b_fill_fake_txdesc(padapter, &ReservedPagePacket[BufIndex-TxDescLen], NullDataLength, false, false, false);
 
 	/* DBG_871X("%s(): HW_VAR_SET_TX_CMD: NULL DATA %p %d\n", */
-	/* 	__func__, &ReservedPagePacket[BufIndex-TxDescLen], (NullDataLength+TxDescLen)); */
+	/*	__func__, &ReservedPagePacket[BufIndex-TxDescLen], (NullDataLength+TxDescLen)); */
 
 	CurtPktPageNum = (u8)PageNum_128(TxDescLen + NullDataLength);
 
@@ -1537,7 +1537,7 @@ static void rtl8723b_set_FwRsvdPagePkt(
 	rtl8723b_fill_fake_txdesc(padapter, &ReservedPagePacket[BufIndex-TxDescLen], QosNullLength, false, false, false);
 
 	/* DBG_871X("%s(): HW_VAR_SET_TX_CMD: QOS NULL DATA %p %d\n", */
-	/* 	__func__, &ReservedPagePacket[BufIndex-TxDescLen], (QosNullLength+TxDescLen)); */
+	/*	__func__, &ReservedPagePacket[BufIndex-TxDescLen], (QosNullLength+TxDescLen)); */
 
 	CurtPktPageNum = (u8)PageNum_128(TxDescLen + QosNullLength);
 
@@ -1557,7 +1557,7 @@ static void rtl8723b_set_FwRsvdPagePkt(
 	rtl8723b_fill_fake_txdesc(padapter, &ReservedPagePacket[BufIndex-TxDescLen], BTQosNullLength, false, true, false);
 
 	/* DBG_871X("%s(): HW_VAR_SET_TX_CMD: BT QOS NULL DATA %p %d\n", */
-	/* 	__func__, &ReservedPagePacket[BufIndex-TxDescLen], (BTQosNullLength+TxDescLen)); */
+	/*	__func__, &ReservedPagePacket[BufIndex-TxDescLen], (BTQosNullLength+TxDescLen)); */
 
 	CurtPktPageNum = (u8)PageNum_128(TxDescLen + BTQosNullLength);
 
@@ -1583,7 +1583,7 @@ static void rtl8723b_set_FwRsvdPagePkt(
 	rtl8723b_fill_fake_txdesc(padapter, &ReservedPagePacket[BufIndex-TxDescLen], ARPLegnth, false, false, true);
 
 	/* DBG_871X("%s(): HW_VAR_SET_TX_CMD: ARP RSP %p %d\n", */
-	/* 	__func__, &ReservedPagePacket[BufIndex-TxDescLen], (ARPLegnth+TxDescLen)); */
+	/*	__func__, &ReservedPagePacket[BufIndex-TxDescLen], (ARPLegnth+TxDescLen)); */
 
 	CurtPktPageNum = (u8)PageNum_128(TxDescLen + ARPLegnth);
 	}
@@ -1597,7 +1597,7 @@ static void rtl8723b_set_FwRsvdPagePkt(
 	memcpy(ReservedPagePacket+BufIndex-TxDescLen, cur_dot11txpn, _AES_IV_LEN_);
 
 	/* DBG_871X("%s(): HW_VAR_SET_TX_CMD: SEC IV %p %d\n", */
-	/* 	__func__, &ReservedPagePacket[BufIndex-TxDescLen], _AES_IV_LEN_); */
+	/*	__func__, &ReservedPagePacket[BufIndex-TxDescLen], _AES_IV_LEN_); */
 
 	CurtPktPageNum = (u8)PageNum_128(_AES_IV_LEN_);
 
@@ -1623,7 +1623,7 @@ static void rtl8723b_set_FwRsvdPagePkt(
 	memcpy(ReservedPagePacket+BufIndex-TxDescLen+RTW_KCK_LEN, kek, RTW_KEK_LEN);
 
 	/* DBG_871X("%s(): HW_VAR_SET_TX_CMD: KEK KCK %p %d\n", */
-	/* 	__func__, &ReservedPagePacket[BufIndex-TxDescLen], (TxDescLen + RTW_KCK_LEN + RTW_KEK_LEN)); */
+	/*	__func__, &ReservedPagePacket[BufIndex-TxDescLen], (TxDescLen + RTW_KCK_LEN + RTW_KEK_LEN)); */
 
 	CurtPktPageNum = (u8)PageNum_128(TxDescLen + RTW_KCK_LEN + RTW_KEK_LEN);
 
@@ -1641,7 +1641,7 @@ static void rtl8723b_set_FwRsvdPagePkt(
 
 	rtl8723b_fill_fake_txdesc(padapter, &ReservedPagePacket[BufIndex-TxDescLen], GTKLegnth, false, false, true);
 	/* DBG_871X("%s(): HW_VAR_SET_TX_CMD: GTK RSP %p %d\n", */
-	/* 	__func__, &ReservedPagePacket[BufIndex-TxDescLen], (TxDescLen + GTKLegnth)); */
+	/*	__func__, &ReservedPagePacket[BufIndex-TxDescLen], (TxDescLen + GTKLegnth)); */
 
 	CurtPktPageNum = (u8)PageNum_128(TxDescLen + GTKLegnth);
 
@@ -2139,7 +2139,7 @@ static void SetFwRsvdPagePkt_BTCoex(struct adapter *padapter)
 	RSVDPAGE_LOC RsvdPageLoc;
 
 
-/* 	DBG_8192C("+" FUNC_ADPT_FMT "\n", FUNC_ADPT_ARG(padapter)); */
+/*	DBG_8192C("+" FUNC_ADPT_FMT "\n", FUNC_ADPT_ARG(padapter)); */
 
 	pxmitpriv = &padapter->xmitpriv;
 	TxDescLen = TXDESC_SIZE;
@@ -2207,8 +2207,8 @@ static void SetFwRsvdPagePkt_BTCoex(struct adapter *padapter)
 	pattrib->pktlen = pattrib->last_txcmdsz = TotalPacketLen - TxDescOffset;
 	dump_mgntframe_and_wait(padapter, pcmdframe, 100);
 
-/* 	DBG_8192C(FUNC_ADPT_FMT ": Set RSVD page location to Fw, TotalPacketLen(%d), TotalPageNum(%d)\n", */
-/* 		FUNC_ADPT_ARG(padapter), TotalPacketLen, TotalPageNum); */
+/*	DBG_8192C(FUNC_ADPT_FMT ": Set RSVD page location to Fw, TotalPacketLen(%d), TotalPageNum(%d)\n", */
+/*		FUNC_ADPT_ARG(padapter), TotalPacketLen, TotalPageNum); */
 	rtl8723b_set_FwRsvdPage_cmd(padapter, &RsvdPageLoc);
 	rtl8723b_set_FwAoacRsvdPage_cmd(padapter, &RsvdPageLoc);
 
@@ -2280,7 +2280,7 @@ void rtl8723b_download_BTCoex_AP_mode_rsvd_page(struct adapter *padapter)
 		DLBcnCount++;
 		do {
 			yield();
-/* 			mdelay(10); */
+/*			mdelay(10); */
 			/*  check rsvd page download OK. */
 			rtw_hal_get_hwreg(padapter, HW_VAR_BCN_VALID, &bcn_valid);
 			poll++;
drivers/staging/rtl8723bs/hal/rtl8723b_dm.c +2 -2
index 650fbedd34e8..cb55b60dec53 100644
@@ -50,7 +50,7 @@ static void Init_ODM_ComInfo_8723b(struct adapter *Adapter)
 	ODM_CmnInfoInit(pDM_Odm, ODM_CMNINFO_MP_TEST_CHIP, IS_NORMAL_CHIP(pHalData->VersionID));
 
 	ODM_CmnInfoInit(pDM_Odm, ODM_CMNINFO_PATCH_ID, pHalData->CustomerID);
-	/* 	ODM_CMNINFO_BINHCT_TEST only for MP Team */
+	/*	ODM_CMNINFO_BINHCT_TEST only for MP Team */
 	ODM_CmnInfoInit(pDM_Odm, ODM_CMNINFO_BWIFI_TEST, Adapter->registrypriv.wifi_spec);
 
 
@@ -100,7 +100,7 @@ static void Update_ODM_ComInfo_8723b(struct adapter *Adapter)
 	/*  Pointer reference */
 	/*  */
 	/* ODM_CMNINFO_MAC_PHY_MODE pHalData->MacPhyMode92D */
-	/* 	ODM_CmnInfoHook(pDM_Odm, ODM_CMNINFO_MAC_PHY_MODE,&(pDM_Odm->u8_temp)); */
+	/*	ODM_CmnInfoHook(pDM_Odm, ODM_CMNINFO_MAC_PHY_MODE,&(pDM_Odm->u8_temp)); */
 
 	ODM_CmnInfoUpdate(pDM_Odm, ODM_CMNINFO_ABILITY, pdmpriv->InitODMFlag);
 
drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +43 -43

291 lines not on this page · raw message

drivers/staging/rtl8723bs/hal/rtl8723b_phycfg.c +18 -18
index cf23414d7224..a72ed64e5d99 100644
@@ -25,10 +25,10 @@
 * OverView:	Get shifted position of the BitMask
 *
 * Input:
-*		u32 	BitMask,
+*		u32		BitMask,
 *
 * Output:	none
-* Return:		u32 	Return the shift bit bit position of the mask
+* Return:		u32		Return the shift bit bit position of the mask
 */
 static	u32 phy_CalculateBitShift(u32 BitMask)
 {
@@ -49,11 +49,11 @@ static	u32 phy_CalculateBitShift(u32 BitMask)
 *
 * Input:
 *		struct adapter *	Adapter,
-*		u32 		RegAddr,	The target address to be readback
-*		u32 		BitMask		The target bit position in the target address
+*		u32			RegAddr,	The target address to be readback
+*		u32			BitMask		The target bit position in the target address
 *							to be readback
 * Output:	None
-* Return:		u32 		Data		The readback register value
+* Return:		u32			Data		The readback register value
 * Note:		This function is equal to "GetRegSetting" in PHY programming guide
 */
 u32 PHY_QueryBBReg_8723B(struct adapter *Adapter, u32 RegAddr, u32 BitMask)
@@ -81,10 +81,10 @@ u32 PHY_QueryBBReg_8723B(struct adapter *Adapter, u32 RegAddr, u32 BitMask)
 *
 * Input:
 *		struct adapter *	Adapter,
-*		u32 		RegAddr,	The target address to be modified
-*		u32 		BitMask		The target bit position in the target address
+*		u32			RegAddr,	The target address to be modified
+*		u32			BitMask		The target bit position in the target address
 *								to be modified
-*		u32 		Data		The new register value in the target bit position
+*		u32			Data		The new register value in the target bit position
 *								of the target address
 *
 * Output:	None
@@ -191,8 +191,8 @@ static u32 phy_RFSerialRead_8723B(
 * Input:
 *		struct adapter *	Adapter,
 *		RF_PATH			eRFPath,	Radio path of A/B/C/D
-*		u32 		Offset,		The target address to be read
-*		u32 		Data		The new register Data in the target bit position
+*		u32			Offset,		The target address to be read
+*		u32			Data		The new register Data in the target bit position
 *								of the target to be read
 *
 * Output:	None
@@ -268,12 +268,12 @@ static void phy_RFSerialWrite_8723B(
 * Input:
 *		struct adapter *	Adapter,
 *		RF_PATH			eRFPath,	Radio path of A/B/C/D
-*		u32 		RegAddr,	The target address to be read
-*		u32 		BitMask		The target bit position in the target address
+*		u32				RegAddr,	The target address to be read
+*		u32				BitMask		The target bit position in the target address
 *								to be read
 *
 * Output:	None
-* Return:		u32 		Readback value
+* Return:		u32		Readback value
 * Note:		This function is equal to "GetRFRegSetting" in PHY programming guide
 */
 u32 PHY_QueryRFReg_8723B(
@@ -302,11 +302,11 @@ u32 PHY_QueryRFReg_8723B(
 *
 * Input:
 *		struct adapter *	Adapter,
-*		RF_PATH			eRFPath,	Radio path of A/B/C/D
-*		u32 		RegAddr,	The target address to be modified
-*		u32 		BitMask		The target bit position in the target address
+*		RF_PATH		eRFPath,	Radio path of A/B/C/D
+*		u32			RegAddr,	The target address to be modified
+*		u32			BitMask		The target bit position in the target address
 *								to be modified
-*		u32 		Data		The new register Data in the target bit position
+*		u32			Data		The new register Data in the target bit position
 *								of the target address
 *
 * Output:	None
@@ -789,7 +789,7 @@ static void phy_PostSetBwMode8723B(struct adapter *Adapter)
 
 		PHY_SetBBReg(Adapter, rFPGA1_RFMOD, bRFMOD, 0x0);
 
-/* 			PHY_SetBBReg(Adapter, rFPGA0_AnalogParameter2, BIT10, 1); */
+/*			PHY_SetBBReg(Adapter, rFPGA0_AnalogParameter2, BIT10, 1); */
 
 		PHY_SetBBReg(Adapter, rOFDM0_TxPseudoNoiseWgt, (BIT31|BIT30), 0x0);
 		break;
drivers/staging/rtl8723bs/hal/rtl8723bs_recv.c +7 -7
index 1fbf89cb72d0..841ba12921f3 100644
@@ -38,7 +38,7 @@ static void update_recvframe_attrib(struct adapter *padapter,
 
 	/*  update rx report to recv_frame attribute */
 	pattrib->pkt_rpt_type = prxreport->c2h_ind ? C2H_PACKET : NORMAL_RX;
-/* 	DBG_871X("%s: pkt_rpt_type =%d\n", __func__, pattrib->pkt_rpt_type); */
+/*	DBG_871X("%s: pkt_rpt_type =%d\n", __func__, pattrib->pkt_rpt_type); */
 
 	if (pattrib->pkt_rpt_type == NORMAL_RX) {
 		/*  Normal rx packet */
@@ -127,7 +127,7 @@ static void update_recvframe_phyinfo(union recv_frame *precvframe,
 	if (psta) {
 		pkt_info.station_id = psta->mac_id;
 		/* DBG_8192C("%s ==> StationID(%d)\n",
-		 * 	  __func__, pkt_info.station_id); */
+		 *	  __func__, pkt_info.station_id); */
 	}
 	pkt_info.data_rate = pattrib->data_rate;
 
@@ -287,9 +287,9 @@ static void rtl8723bs_recv_tasklet(struct tasklet_struct *t)
 				rtw_free_recvframe(precvframe,
 						   &precvpriv->free_recv_queue);
 			} else {
-				/* 	Modified by Albert 20101213 */
-				/* 	For 8 bytes IP header alignment. */
-				if (pattrib->qos)	/* 	Qos data, wireless lan header length is 26 */
+				/*	Modified by Albert 20101213 */
+				/*	For 8 bytes IP header alignment. */
+				if (pattrib->qos)	/*	Qos data, wireless lan header length is 26 */
 					shift_sz = 6;
 				else
 					shift_sz = 0;
@@ -305,8 +305,8 @@ static void rtl8723bs_recv_tasklet(struct tasklet_struct *t)
 						alloc_sz = skb_len + 14;
 				} else {
 					alloc_sz = skb_len;
-					/* 	6 is for IP header 8 bytes alignment in QoS packet case. */
-					/* 	8 is for skb->data 4 bytes alignment. */
+					/*	6 is for IP header 8 bytes alignment in QoS packet case. */
+					/*	8 is for skb->data 4 bytes alignment. */
 					alloc_sz += 14;
 				}
 
drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c +3 -3
index 28a4b5baed2e..fbfafe86e8b2 100644
@@ -39,7 +39,7 @@ static u8 rtw_sdio_wait_enough_TxOQT_space(struct adapter *padapter, u8 agg_num)
 	pHalData->SdioTxOQTFreeSpace -= agg_num;
 
 	/* if (n > 1) */
-	/* 	++priv->pshare->nr_out_of_txoqt_space; */
+	/*	++priv->pshare->nr_out_of_txoqt_space; */
 
 	return true;
 }
@@ -180,7 +180,7 @@ s32 rtl8723bs_xmit_buf_handler(struct adapter *padapter)
 
 	do {
 		queue_empty = rtl8723_dequeue_writeport(padapter);
-/* 	dump secondary adapter xmitbuf */
+/*	dump secondary adapter xmitbuf */
 	} while (!queue_empty);
 
 	rtw_unregister_tx_alive(padapter);
@@ -358,7 +358,7 @@ static s32 xmit_xmitframes(struct adapter *padapter, struct xmit_priv *pxmitpriv
 					pxmitframe->pg_num = (txlen + 127) / 128;
 					pxmitbuf->pg_num += (txlen + 127) / 128;
 				    /* if (k != 1) */
-					/* 	((struct xmit_frame*)pxmitbuf->priv_data)->pg_num += pxmitframe->pg_num; */
+					/*	((struct xmit_frame*)pxmitbuf->priv_data)->pg_num += pxmitframe->pg_num; */
 					pxmitbuf->ptail += _RND(txlen, 8); /*  round to 8 bytes alignment */
 					pxmitbuf->len = _RND(pxmitbuf->len, 8) + txlen;
 				}
drivers/staging/rtl8723bs/hal/sdio_halinit.c +36 -36

220 lines not on this page · raw message

Signature · 1 line
2.25.1
#7 lore raw

PATCH 3/4 staging: rtl8723bs: hal: fix unnecessary braces

In reply to Amarjargal Gundjalam

Fix following checkpatch warnings:
WARNING: braces {} are not necessary for single statement blocks
WARNING: braces {} are not necessary for any arm of this statement

---
 .../staging/rtl8723bs/hal/HalBtc8723b2Ant.c   | 26 +++----
 .../staging/rtl8723bs/hal/HalPhyRf_8723B.c    | 30 ++++----
 drivers/staging/rtl8723bs/hal/hal_btcoex.c    |  9 ++-
 .../rtl8723bs/hal/odm_RegConfig8723B.c        |  7 +-
 drivers/staging/rtl8723bs/hal/rtl8723b_cmd.c  | 12 ++--
 drivers/staging/rtl8723bs/hal/rtl8723b_dm.c   |  7 +-
 .../staging/rtl8723bs/hal/rtl8723b_hal_init.c | 68 +++++++------------
 .../staging/rtl8723bs/hal/rtl8723bs_recv.c    |  6 +-
 .../staging/rtl8723bs/hal/rtl8723bs_xmit.c    | 12 ++--
 drivers/staging/rtl8723bs/hal/sdio_halinit.c  |  6 +-
 10 files changed, 68 insertions(+), 115 deletions(-)
drivers/staging/rtl8723bs/hal/HalBtc8723b2Ant.c +10 -16
index 1f5df0c7131a..6701e07bcd1b 100644
@@ -2034,9 +2034,8 @@ static void halbtc8723b2ant_TdmaDurationAdjust(
 
 		if (!bScan && !bLink && !bRoam)
 			halbtc8723b2ant_PsTdma(pBtCoexist, NORMAL_EXEC, true, pCoexDm->psTdmaDuAdjType);
-		else {
+		else
 			BTC_PRINT(BTC_MSG_ALGORITHM, ALGO_TRACE_FW_DETAIL, ("[BTCoex], roaming/link/scan is under progress, will adjust next time!!!\n"));
-		}
 	}
 }
 
@@ -3289,20 +3288,18 @@ void EXhalbtc8723b2ant_LpsNotify(PBTC_COEXIST pBtCoexist, u8 type)
 
 void EXhalbtc8723b2ant_ScanNotify(PBTC_COEXIST pBtCoexist, u8 type)
 {
-	if (type == BTC_SCAN_START) {
+	if (type == BTC_SCAN_START)
 		BTC_PRINT(BTC_MSG_INTERFACE, INTF_NOTIFY, ("[BTCoex], SCAN START notify\n"));
-	} else if (type == BTC_SCAN_FINISH) {
+	else if (type == BTC_SCAN_FINISH)
 		BTC_PRINT(BTC_MSG_INTERFACE, INTF_NOTIFY, ("[BTCoex], SCAN FINISH notify\n"));
-	}
 }
 
 void EXhalbtc8723b2ant_ConnectNotify(PBTC_COEXIST pBtCoexist, u8 type)
 {
-	if (type == BTC_ASSOCIATE_START) {
+	if (type == BTC_ASSOCIATE_START)
 		BTC_PRINT(BTC_MSG_INTERFACE, INTF_NOTIFY, ("[BTCoex], CONNECT START notify\n"));
-	} else if (type == BTC_ASSOCIATE_FINISH) {
+	else if (type == BTC_ASSOCIATE_FINISH)
 		BTC_PRINT(BTC_MSG_INTERFACE, INTF_NOTIFY, ("[BTCoex], CONNECT FINISH notify\n"));
-	}
 }
 
 void EXhalbtc8723b2ant_MediaStatusNotify(PBTC_COEXIST pBtCoexist, u8 type)
@@ -3312,11 +3309,10 @@ void EXhalbtc8723b2ant_MediaStatusNotify(PBTC_COEXIST pBtCoexist, u8 type)
 	u8 wifiCentralChnl;
 	u8 apNum = 0;
 
-	if (type == BTC_MEDIA_CONNECT) {
+	if (type == BTC_MEDIA_CONNECT)
 		BTC_PRINT(BTC_MSG_INTERFACE, INTF_NOTIFY, ("[BTCoex], MEDIA connect notify\n"));
-	} else {
+	else
 		BTC_PRINT(BTC_MSG_INTERFACE, INTF_NOTIFY, ("[BTCoex], MEDIA disconnect notify\n"));
-	}
 
 	/*  only 2.4G we need to inform bt the chnl mask */
 	pBtCoexist->fBtcGet(pBtCoexist, BTC_GET_U1_WIFI_CENTRAL_CHNL, &wifiCentralChnl);
@@ -3353,9 +3349,8 @@ void EXhalbtc8723b2ant_MediaStatusNotify(PBTC_COEXIST pBtCoexist, u8 type)
 
 void EXhalbtc8723b2ant_SpecialPacketNotify(PBTC_COEXIST pBtCoexist, u8 type)
 {
-	if (type == BTC_PACKET_DHCP) {
+	if (type == BTC_PACKET_DHCP)
 		BTC_PRINT(BTC_MSG_INTERFACE, INTF_NOTIFY, ("[BTCoex], DHCP Packet notify\n"));
-	}
 }
 
 void EXhalbtc8723b2ant_BtInfoNotify(
@@ -3381,11 +3376,10 @@ void EXhalbtc8723b2ant_BtInfoNotify(
 		if (i == 1)
 			btInfo = tmpBuf[i];
 
-		if (i == length-1) {
+		if (i == length-1)
 			BTC_PRINT(BTC_MSG_INTERFACE, INTF_NOTIFY, ("0x%02x]\n", tmpBuf[i]));
-		} else {
+		else
 			BTC_PRINT(BTC_MSG_INTERFACE, INTF_NOTIFY, ("0x%02x, ", tmpBuf[i]));
-		}
 	}
 
 	if (pBtCoexist->bManualControl) {
drivers/staging/rtl8723bs/hal/HalPhyRf_8723B.c +12 -18
index 8aa888740929..4a2de254a519 100644
@@ -1298,9 +1298,8 @@ static void _PHY_SaveADDARegisters8723B(
 		return;
 
 	ODM_RT_TRACE(pDM_Odm, ODM_COMP_CALIBRATION, ODM_DBG_LOUD, ("Save ADDA parameters.\n"));
-	for (i = 0 ; i < RegisterNum ; i++) {
+	for (i = 0 ; i < RegisterNum ; i++)
 		ADDABackup[i] = PHY_QueryBBReg(pDM_Odm->Adapter, ADDAReg[i], bMaskDWord);
-	}
 }
 
 
@@ -1313,9 +1312,9 @@ static void _PHY_SaveMACRegisters8723B(
 	PDM_ODM_T		pDM_Odm = &pHalData->odmpriv;
 
 	ODM_RT_TRACE(pDM_Odm, ODM_COMP_CALIBRATION, ODM_DBG_LOUD, ("Save MAC parameters.\n"));
-	for (i = 0 ; i < (IQK_MAC_REG_NUM - 1); i++) {
+	for (i = 0 ; i < (IQK_MAC_REG_NUM - 1); i++)
 		MACBackup[i] = rtw_read8(pDM_Odm->Adapter, MACReg[i]);
-	}
+
 	MACBackup[i] = rtw_read32(pDM_Odm->Adapter, MACReg[i]);
 
 }
@@ -1333,9 +1332,8 @@ static void _PHY_ReloadADDARegisters8723B(
 	PDM_ODM_T pDM_Odm = &pHalData->odmpriv;
 
 	ODM_RT_TRACE(pDM_Odm, ODM_COMP_CALIBRATION, ODM_DBG_LOUD, ("Reload ADDA power saving parameters !\n"));
-	for (i = 0 ; i < RegiesterNum; i++) {
+	for (i = 0 ; i < RegiesterNum; i++)
 		PHY_SetBBReg(pDM_Odm->Adapter, ADDAReg[i], bMaskDWord, ADDABackup[i]);
-	}
 }
 
 static void _PHY_ReloadMACRegisters8723B(
@@ -1344,9 +1342,9 @@ static void _PHY_ReloadMACRegisters8723B(
 {
 	u32 i;
 
-	for (i = 0 ; i < (IQK_MAC_REG_NUM - 1); i++) {
+	for (i = 0 ; i < (IQK_MAC_REG_NUM - 1); i++)
 		rtw_write8(padapter, MACReg[i], (u8)MACBackup[i]);
-	}
+
 	rtw_write32(padapter, MACReg[i], MACBackup[i]);
 }
 
@@ -1372,9 +1370,8 @@ static void _PHY_PathADDAOn8723B(
 		PHY_SetBBReg(pDM_Odm->Adapter, ADDAReg[0], bMaskDWord, pathOn);
 	}
 
-	for (i = 1 ; i < IQK_ADDA_REG_NUM ; i++) {
+	for (i = 1 ; i < IQK_ADDA_REG_NUM ; i++)
 		PHY_SetBBReg(pDM_Odm->Adapter, ADDAReg[i], bMaskDWord, pathOn);
-	}
 
 }
 
@@ -1390,9 +1387,9 @@ static void _PHY_MACSettingCalibration8723B(
 
 	rtw_write8(pDM_Odm->Adapter, MACReg[i], 0x3F);
 
-	for (i = 1 ; i < (IQK_MAC_REG_NUM - 1); i++) {
+	for (i = 1 ; i < (IQK_MAC_REG_NUM - 1); i++)
 		rtw_write8(pDM_Odm->Adapter, MACReg[i], (u8)(MACBackup[i]&(~BIT3)));
-	}
+
 	rtw_write8(pDM_Odm->Adapter, MACReg[i], (u8)(MACBackup[i]&(~BIT5)));
 
 }
@@ -1623,9 +1620,8 @@ static void phy_IQCalibrate_8723B(
 		}
 	}
 
-	if (PathAOK == 0x00) {
+	if (PathAOK == 0x00)
 		ODM_RT_TRACE(pDM_Odm, ODM_COMP_CALIBRATION, ODM_DBG_LOUD, ("Path A IQK failed!!\n"));
-	}
 
 /* path B IQK */
 	if (is2T) {
@@ -1661,9 +1657,8 @@ static void phy_IQCalibrate_8723B(
 		}
 
 /* Allen end */
-		if (PathBOK == 0x00) {
+		if (PathBOK == 0x00)
 			ODM_RT_TRACE(pDM_Odm, ODM_COMP_CALIBRATION, ODM_DBG_LOUD, ("Path B IQK failed!!\n"));
-		}
 	}
 
 	/* Back to BB mode, load original value */
@@ -1746,9 +1741,8 @@ static void phy_LCCalibrate_8723B(PDM_ODM_T pDM_Odm, bool is2T)
 	PHY_SetRFReg(pDM_Odm->Adapter, ODM_RF_PATH_A, 0xB0, bRFRegOffsetMask, 0xDFFE0); /*  LDO OFF */
 
 	/*  Channel 10 LC calibration issue for 8723bs with 26M xtal */
-	if (pDM_Odm->SupportInterface == ODM_ITRF_SDIO && pDM_Odm->PackageType >= 0x2) {
+	if (pDM_Odm->SupportInterface == ODM_ITRF_SDIO && pDM_Odm->PackageType >= 0x2)
 		PHY_SetRFReg(pDM_Odm->Adapter, ODM_RF_PATH_A, RF_CHNLBW, bMask12Bits, LC_Cal);
-	}
 
 	/* Restore original situation */
 	if ((tmpReg&0x70) != 0) { /* Deal with contisuous TX case */
drivers/staging/rtl8723bs/hal/hal_btcoex.c +4 -5
index 63421ffe9f40..a9b83118ec42 100644
@@ -1142,15 +1142,14 @@ void EXhalbtcoutsrc_SpecialPacketNotify(PBTC_COEXIST pBtCoexist, u8 pktType)
 	if (pBtCoexist->bManualControl)
 		return;
 
-	if (pktType == PACKET_DHCP) {
+	if (pktType == PACKET_DHCP)
 		packetType = BTC_PACKET_DHCP;
-	} else if (pktType == PACKET_EAPOL) {
+	else if (pktType == PACKET_EAPOL)
 		packetType = BTC_PACKET_EAPOL;
-	} else if (pktType == PACKET_ARP) {
+	else if (pktType == PACKET_ARP)
 		packetType = BTC_PACKET_ARP;
-	} else {
+	else
 		return;
-	}
 
 	/*  All notify is called in cmd thread, don't need to leave low power again */
 /*	halbtcoutsrc_LeaveLowPower(pBtCoexist); */
drivers/staging/rtl8723bs/hal/odm_RegConfig8723B.c +3 -4
index 39f989bf3410..fd0952615f8a 100644
@@ -181,9 +181,9 @@ void odm_ConfigBB_PHY_REG_PG_8723B(
 {
 	if (Addr == 0xfe || Addr == 0xffe)
 		msleep(50);
-	else {
+	else
 		PHY_StoreTxPowerByRate(pDM_Odm->Adapter, Band, RfPath, TxNum, Addr, Bitmask, Data);
-	}
+
 	ODM_RT_TRACE(
 		pDM_Odm,
 		ODM_COMP_INIT,
@@ -216,9 +216,8 @@ void odm_ConfigBB_PHY_8723B(
 		udelay(5);
 	else if (Addr == 0xf9)
 		udelay(1);
-	else {
+	else
 		PHY_SetBBReg(pDM_Odm->Adapter, Addr, Bitmask, Data);
-	}
 
 	/*  Add 1us delay between BB/RF register setting. */
 	udelay(1);
drivers/staging/rtl8723bs/hal/rtl8723b_cmd.c +4 -8
index 20b4173bd0fc..4ad1fb9aecf9 100644
@@ -28,9 +28,8 @@ static u8 _is_fw_read_cmd_down(struct adapter *padapter, u8 msgbox_num)
 
 	do {
 		valid = rtw_read8(padapter, REG_HMETFR) & BIT(msgbox_num);
-		if (valid == 0) {
+		if (valid == 0)
 			read_down = true;
-		}
 #ifdef CONFIG_WOWLAN
 		else
 			msleep(1);
@@ -65,13 +64,11 @@ s32 FillH2CCmd8723B(struct adapter *padapter, u8 ElementID, u32 CmdLen, u8 *pCmd
 	if (mutex_lock_interruptible(&(adapter_to_dvobj(padapter)->h2c_fwcmd_mutex)))
 		return ret;
 
-	if (!pCmdBuffer) {
+	if (!pCmdBuffer)
 		goto exit;
-	}
 
-	if (CmdLen > RTL8723B_MAX_CMD_LEN) {
+	if (CmdLen > RTL8723B_MAX_CMD_LEN)
 		goto exit;
-	}
 
 	if (padapter->bSurpriseRemoved)
 		goto exit;
@@ -437,9 +434,8 @@ static void ConstructARPResponse(
 
 		psta = rtw_get_stainfo(&padapter->stapriv, get_my_bssid(&(pmlmeinfo->network)));
 		if (psta) {
-			if (!memcmp(&psta->dot11tkiptxmickey.skey[0], null_key, 16)) {
+			if (!memcmp(&psta->dot11tkiptxmickey.skey[0], null_key, 16))
 				DBG_871X("%s(): STA dot11tkiptxmickey == 0\n", __func__);
-			}
 			/* start to calculate the mic code */
 			rtw_secmicsetkey(&micdata, &psta->dot11tkiptxmickey.skey[0]);
 		}
drivers/staging/rtl8723bs/hal/rtl8723b_dm.c +3 -4
index cb55b60dec53..2ecb201bb459 100644
@@ -54,13 +54,12 @@ static void Init_ODM_ComInfo_8723b(struct adapter *Adapter)
 	ODM_CmnInfoInit(pDM_Odm, ODM_CMNINFO_BWIFI_TEST, Adapter->registrypriv.wifi_spec);
 
 
-	if (pHalData->rf_type == RF_1T1R) {
+	if (pHalData->rf_type == RF_1T1R)
 		ODM_CmnInfoUpdate(pDM_Odm, ODM_CMNINFO_RF_TYPE, ODM_1T1R);
-	} else if (pHalData->rf_type == RF_2T2R) {
+	else if (pHalData->rf_type == RF_2T2R)
 		ODM_CmnInfoUpdate(pDM_Odm, ODM_CMNINFO_RF_TYPE, ODM_2T2R);
-	} else if (pHalData->rf_type == RF_1T2R) {
+	else if (pHalData->rf_type == RF_1T2R)
 		ODM_CmnInfoUpdate(pDM_Odm, ODM_CMNINFO_RF_TYPE, ODM_1T2R);
-	}
 
 	pdmpriv->InitODMFlag = ODM_RF_CALIBRATION|ODM_RF_TX_PWR_TRACK;
 
drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +24 -44

212 lines not on this page · raw message

drivers/staging/rtl8723bs/hal/rtl8723bs_recv.c +2 -4
index 841ba12921f3..4ec80626ca82 100644
@@ -345,9 +345,8 @@ static void rtl8723bs_recv_tasklet(struct tasklet_struct *t)
 					if (pattrib->physt)
 						update_recvframe_phyinfo(precvframe, (struct phy_stat *)ptr);
 
-					if (rtw_recv_entry(precvframe) != _SUCCESS) {
+					if (rtw_recv_entry(precvframe) != _SUCCESS)
 						RT_TRACE(_module_rtl871x_recv_c_, _drv_dump_, ("%s: rtw_recv_entry(precvframe) != _SUCCESS\n", __func__));
-					}
 				} else if (pattrib->pkt_rpt_type == C2H_PACKET) {
 					C2H_EVT_HDR	C2hEvent;
 
@@ -429,9 +428,8 @@ s32 rtl8723bs_init_recv_priv(struct adapter *padapter)
 				skb_reserve(precvbuf->pskb, (RECVBUFF_ALIGN_SZ - alignment));
 			}
 
-			if (!precvbuf->pskb) {
+			if (!precvbuf->pskb)
 				DBG_871X("%s: alloc_skb fail!\n", __func__);
-			}
 		}
 
 		list_add_tail(&precvbuf->list, &precvpriv->free_recv_buf_queue.queue);
drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c +4 -8
index fbfafe86e8b2..36a80533444e 100644
@@ -174,9 +174,8 @@ s32 rtl8723bs_xmit_buf_handler(struct adapter *padapter)
 		return _SUCCESS;
 
 	ret = rtw_register_tx_alive(padapter);
-	if (ret != _SUCCESS) {
+	if (ret != _SUCCESS)
 		return _SUCCESS;
-	}
 
 	do {
 		queue_empty = rtl8723_dequeue_writeport(padapter);
@@ -444,9 +443,8 @@ static s32 rtl8723bs_xmit_handler(struct adapter *padapter)
 	spin_lock_bh(&pxmitpriv->lock);
 	ret = rtw_txframes_pending(padapter);
 	spin_unlock_bh(&pxmitpriv->lock);
-	if (ret == 0) {
+	if (ret == 0)
 		return _SUCCESS;
-	}
 
 	/*  dequeue frame and write to hardware */
 
@@ -464,9 +462,8 @@ static s32 rtl8723bs_xmit_handler(struct adapter *padapter)
 	spin_lock_bh(&pxmitpriv->lock);
 	ret = rtw_txframes_pending(padapter);
 	spin_unlock_bh(&pxmitpriv->lock);
-	if (ret == 1) {
+	if (ret == 1)
 		goto next;
-	}
 
 	return _SUCCESS;
 }
@@ -489,9 +486,8 @@ int rtl8723bs_xmit_thread(void *context)
 
 	do {
 		ret = rtl8723bs_xmit_handler(padapter);
-		if (signal_pending(current)) {
+		if (signal_pending(current))
 			flush_signals(current);
-		}
 	} while (ret == _SUCCESS);
 
 	complete(&pxmitpriv->SdioXmitTerminate);
drivers/staging/rtl8723bs/hal/sdio_halinit.c +2 -4
index 0cc2e06636b1..4a7a0ade29d2 100644
@@ -1011,9 +1011,8 @@ static void CardDisableRTL8723BSdio(struct adapter *padapter)
 
 	/*  Run LPS WL RFOFF flow */
 	ret = HalPwrSeqCmdParsing(padapter, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_SDIO_MSK, rtl8723B_enter_lps_flow);
-	if (ret == _FAIL) {
+	if (ret == _FAIL)
 		DBG_8192C(KERN_ERR "%s: run RF OFF flow fail!\n", __func__);
-	}
 
 	/*	==== Reset digital sequence   ====== */
 
@@ -1044,9 +1043,8 @@ static void CardDisableRTL8723BSdio(struct adapter *padapter)
 	ret = false;
 	rtw_hal_set_hwreg(padapter, HW_VAR_APFM_ON_MAC, &bMacPwrCtrlOn);
 	ret = HalPwrSeqCmdParsing(padapter, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_SDIO_MSK, rtl8723B_card_disable_flow);
-	if (!ret) {
+	if (!ret)
 		DBG_8192C(KERN_ERR "%s: run CARD DISABLE flow fail!\n", __func__);
-	}
 }
 
 static u32 rtl8723bs_hal_deinit(struct adapter *padapter)
Signature · 1 line
2.25.1
#8 lore raw

PATCH 4/4 staging: rtl8723bs: hal: use __func__ instead of function name

In reply to Amarjargal Gundjalam

Fix following checkpatch warning:
WARNING: Prefer using '"%s...", __func__' to using function's name, in a string"

---
 .../staging/rtl8723bs/hal/HalHWImg8723B_BB.c  | 10 +--
 .../staging/rtl8723bs/hal/HalHWImg8723B_MAC.c |  6 +-
 .../staging/rtl8723bs/hal/HalHWImg8723B_RF.c  |  8 +-
 drivers/staging/rtl8723bs/hal/HalPhyRf.c      |  5 +-
 .../staging/rtl8723bs/hal/HalPhyRf_8723B.c    |  8 +-
 drivers/staging/rtl8723bs/hal/HalPwrSeqCmd.c  | 15 ++--
 drivers/staging/rtl8723bs/hal/hal_com.c       |  6 +-
 .../staging/rtl8723bs/hal/hal_com_phycfg.c    | 28 +++---
 drivers/staging/rtl8723bs/hal/hal_intf.c      |  4 +-
 drivers/staging/rtl8723bs/hal/odm.c           |  6 +-
 .../staging/rtl8723bs/hal/odm_CfoTracking.c   | 31 ++++---
 drivers/staging/rtl8723bs/hal/odm_DIG.c       | 85 ++++++++++---------
 .../rtl8723bs/hal/odm_EdcaTurboCheck.c        |  4 +-
 drivers/staging/rtl8723bs/hal/odm_HWConfig.c  |  6 +-
 .../staging/rtl8723bs/hal/rtl8723b_hal_init.c | 31 ++++---
 .../staging/rtl8723bs/hal/rtl8723b_phycfg.c   |  6 +-
 .../staging/rtl8723bs/hal/rtl8723bs_xmit.c    |  2 +-
 drivers/staging/rtl8723bs/hal/sdio_halinit.c  | 18 ++--
 18 files changed, 146 insertions(+), 133 deletions(-)
drivers/staging/rtl8723bs/hal/HalHWImg8723B_BB.c +5 -5
index 19856e806b1f..fcfa4a054639 100644
@@ -38,7 +38,7 @@ static bool CheckPositive(
 		ODM_COMP_INIT,
 		ODM_DBG_TRACE,
 		(
-			"===> [8812A] CheckPositive (cond1, cond2) = (0x%X 0x%X)\n",
+			"===> [8812A] %s (cond1, cond2) = (0x%X 0x%X)\n", __func__,
 			cond1,
 			cond2
 		)
@@ -48,7 +48,7 @@ static bool CheckPositive(
 		ODM_COMP_INIT,
 		ODM_DBG_TRACE,
 		(
-			"===> [8812A] CheckPositive (driver1, driver2) = (0x%X 0x%X)\n",
+			"===> [8812A] %s (driver1, driver2) = (0x%X 0x%X)\n", __func__,
 			driver1,
 			driver2
 		)
@@ -267,7 +267,7 @@ void ODM_ReadAndConfig_MP_8723B_AGC_TAB(PDM_ODM_T pDM_Odm)
 		pDM_Odm,
 		ODM_COMP_INIT,
 		ODM_DBG_LOUD,
-		("===> ODM_ReadAndConfig_MP_8723B_AGC_TAB\n")
+		("===> %s\n", __func__)
 	);
 
 	for (i = 0; i < ArrayLen; i += 2) {
@@ -536,7 +536,7 @@ void ODM_ReadAndConfig_MP_8723B_PHY_REG(PDM_ODM_T pDM_Odm)
 		pDM_Odm,
 		ODM_COMP_INIT,
 		ODM_DBG_LOUD,
-		("===> ODM_ReadAndConfig_MP_8723B_PHY_REG\n")
+		("===> %s\n", __func__)
 	);
 
 	for (i = 0; i < ArrayLen; i += 2) {
@@ -615,7 +615,7 @@ void ODM_ReadAndConfig_MP_8723B_PHY_REG_PG(PDM_ODM_T pDM_Odm)
 		pDM_Odm,
 		ODM_COMP_INIT,
 		ODM_DBG_LOUD,
-		("===> ODM_ReadAndConfig_MP_8723B_PHY_REG_PG\n")
+		("===> %s\n", __func__)
 	);
 
 	pDM_Odm->PhyRegPgVersion = 1;
drivers/staging/rtl8723bs/hal/HalHWImg8723B_MAC.c +3 -3
index b80c5b11796b..e4d212fc86a6 100644
@@ -38,7 +38,7 @@ static bool CheckPositive(
 		ODM_COMP_INIT,
 		ODM_DBG_TRACE,
 		(
-			"===> [8812A] CheckPositive (cond1, cond2) = (0x%X 0x%X)\n",
+			"===> [8812A] %s (cond1, cond2) = (0x%X 0x%X)\n", __func__,
 			cond1,
 			cond2
 		)
@@ -48,7 +48,7 @@ static bool CheckPositive(
 		ODM_COMP_INIT,
 		ODM_DBG_TRACE,
 		(
-			"===> [8812A] CheckPositive (driver1, driver2) = (0x%X 0x%X)\n",
+			"===> [8812A] %s (driver1, driver2) = (0x%X 0x%X)\n", __func__,
 			driver1,
 			driver2
 		)
@@ -238,7 +238,7 @@ void ODM_ReadAndConfig_MP_8723B_MAC_REG(PDM_ODM_T pDM_Odm)
 		pDM_Odm,
 		ODM_COMP_INIT,
 		ODM_DBG_LOUD,
-		("===> ODM_ReadAndConfig_MP_8723B_MAC_REG\n")
+		("===> %s\n", __func__)
 	);
 
 	for (i = 0; i < ArrayLen; i += 2) {
drivers/staging/rtl8723bs/hal/HalHWImg8723B_RF.c +4 -4
index 426f68b8f0d2..f98fe1d08167 100644
@@ -38,7 +38,7 @@ static bool CheckPositive(
 		ODM_COMP_INIT,
 		ODM_DBG_TRACE,
 		(
-			"===> [8812A] CheckPositive (cond1, cond2) = (0x%X 0x%X)\n",
+			"===> [8812A] %s (cond1, cond2) = (0x%X 0x%X)\n", __func__,
 			cond1,
 			cond2
 		)
@@ -48,7 +48,7 @@ static bool CheckPositive(
 		ODM_COMP_INIT,
 		ODM_DBG_TRACE,
 		(
-			"===> [8812A] CheckPositive (driver1, driver2) = (0x%X 0x%X)\n",
+			"===> [8812A] %s (driver1, driver2) = (0x%X 0x%X)\n", __func__,
 			driver1,
 			driver2
 		)
@@ -269,7 +269,7 @@ void ODM_ReadAndConfig_MP_8723B_RadioA(PDM_ODM_T pDM_Odm)
 		pDM_Odm,
 		ODM_COMP_INIT,
 		ODM_DBG_LOUD,
-		("===> ODM_ReadAndConfig_MP_8723B_RadioA\n")
+		("===> %s\n", __func__)
 	);
 
 	for (i = 0; i < ArrayLen; i += 2) {
@@ -764,7 +764,7 @@ void ODM_ReadAndConfig_MP_8723B_TXPWR_LMT(PDM_ODM_T pDM_Odm)
 		pDM_Odm,
 		ODM_COMP_INIT,
 		ODM_DBG_LOUD,
-		("===> ODM_ReadAndConfig_MP_8723B_TXPWR_LMT\n")
+		("===> %s\n", __func__)
 	);
 
 	for (i = 0; i < ARRAY_SIZE(Array_MP_8723B_TXPWR_LMT); i += 7) {
drivers/staging/rtl8723bs/hal/HalPhyRf.c +3 -2
index 7b435840746d..74531ca822d1 100644
@@ -113,7 +113,8 @@ void ODM_TXPowerTrackingCallback_ThermalMeter(struct adapter *Adapter)
 		ODM_COMP_TX_PWR_TRACK,
 		ODM_DBG_LOUD,
 		(
-			"===>ODM_TXPowerTrackingCallback_ThermalMeter,\npDM_Odm->BbSwingIdxCckBase: %d, pDM_Odm->BbSwingIdxOfdmBase[A]: %d, pDM_Odm->DefaultOfdmIndex: %d\n",
+			"===>%s,\npDM_Odm->BbSwingIdxCckBase: %d, pDM_Odm->BbSwingIdxOfdmBase[A]: %d, pDM_Odm->DefaultOfdmIndex: %d\n",
+			__func__,
 			pDM_Odm->BbSwingIdxCckBase,
 			pDM_Odm->BbSwingIdxOfdmBase[ODM_RF_PATH_A],
 			pDM_Odm->DefaultOfdmIndex
@@ -617,7 +618,7 @@ void ODM_TXPowerTrackingCallback_ThermalMeter(struct adapter *Adapter)
 		pDM_Odm,
 		ODM_COMP_TX_PWR_TRACK,
 		ODM_DBG_LOUD,
-		("<===ODM_TXPowerTrackingCallback_ThermalMeter\n")
+		("<===%s\n", __func__)
 	);
 
 	pDM_Odm->RFCalibrateInfo.TXPowercount = 0;
drivers/staging/rtl8723bs/hal/HalPhyRf_8723B.c +4 -4
index 4a2de254a519..73c0460327e2 100644
@@ -1133,7 +1133,7 @@ static void _PHY_PathAFillIQKMatrix8723B(
 		pRFCalibrateInfo->TxIQC_8723B[PATH_S1][IDX_0xC4C][VAL] = PHY_QueryBBReg(pDM_Odm->Adapter, rOFDM0_ECCAThreshold, bMaskDWord);
 
 		if (bTxOnly) {
-			ODM_RT_TRACE(pDM_Odm, ODM_COMP_CALIBRATION, ODM_DBG_LOUD,  ("_PHY_PathAFillIQKMatrix8723B only Tx OK\n"));
+			ODM_RT_TRACE(pDM_Odm, ODM_COMP_CALIBRATION, ODM_DBG_LOUD,  ("%s only Tx OK\n", __func__));
 
 			/*  <20130226, Kordan> Saving RxIQC, otherwise not initialized. */
 			pRFCalibrateInfo->RxIQC_8723B[PATH_S1][IDX_0xCA0][KEY] = rOFDM0_RxIQExtAnta;
@@ -1217,7 +1217,7 @@ static void _PHY_PathBFillIQKMatrix8723B(
 		pRFCalibrateInfo->TxIQC_8723B[PATH_S0][IDX_0xC4C][VAL] = PHY_QueryBBReg(pDM_Odm->Adapter, rOFDM0_ECCAThreshold, bMaskDWord);
 
 		if (bTxOnly) {
-			ODM_RT_TRACE(pDM_Odm, ODM_COMP_CALIBRATION, ODM_DBG_LOUD,  ("_PHY_PathBFillIQKMatrix8723B only Tx OK\n"));
+			ODM_RT_TRACE(pDM_Odm, ODM_COMP_CALIBRATION, ODM_DBG_LOUD,  ("%s only Tx OK\n", __func__));
 
 			pRFCalibrateInfo->RxIQC_8723B[PATH_S0][IDX_0xC14][KEY] = rOFDM0_XARxIQImbalance;
 /*			pRFCalibrateInfo->RxIQC_8723B[PATH_S0][IDX_0xC14][VAL] = PHY_QueryBBReg(pDM_Odm->Adapter, rOFDM0_XARxIQImbalance, bMaskDWord); */
@@ -1692,7 +1692,7 @@ static void phy_IQCalibrate_8723B(
 		PHY_SetBBReg(pDM_Odm->Adapter, rRx_IQK_Tone_A, bMaskDWord, 0x01008c00);
 
 	}
-	ODM_RT_TRACE(pDM_Odm, ODM_COMP_CALIBRATION, ODM_DBG_LOUD, ("phy_IQCalibrate_8723B() <==\n"));
+	ODM_RT_TRACE(pDM_Odm, ODM_COMP_CALIBRATION, ODM_DBG_LOUD, ("%s() <==\n", __func__));
 
 }
 
@@ -1880,7 +1880,7 @@ void PHY_IQCalibrate_8723B(
 	}
 
 	if (bReCovery) {
-		ODM_RT_TRACE(pDM_Odm, ODM_COMP_INIT, ODM_DBG_LOUD, ("PHY_IQCalibrate_8723B: Return due to bReCovery!\n"));
+		ODM_RT_TRACE(pDM_Odm, ODM_COMP_INIT, ODM_DBG_LOUD, ("%s: Return due to bReCovery!\n", __func__));
 		_PHY_ReloadADDARegisters8723B(padapter, IQK_BB_REG_92C, pDM_Odm->RFCalibrateInfo.IQK_BB_backup_recover, 9);
 		return;
 	}
drivers/staging/rtl8723bs/hal/HalPwrSeqCmd.c +8 -7
index 3b34a516075f..67ee69ea976b 100644
@@ -57,7 +57,8 @@ u8 HalPwrSeqCmdParsing(
 			_module_hal_init_c_,
 			_drv_info_,
 			(
-				"HalPwrSeqCmdParsing: offset(%#x) cut_msk(%#x) fab_msk(%#x) interface_msk(%#x) base(%#x) cmd(%#x) msk(%#x) value(%#x)\n",
+				"%s: offset(%#x) cut_msk(%#x) fab_msk(%#x) interface_msk(%#x) base(%#x) cmd(%#x) msk(%#x) value(%#x)\n",
+				__func__,
 				GET_PWR_CFG_OFFSET(PwrCfgCmd),
 				GET_PWR_CFG_CUT_MASK(PwrCfgCmd),
 				GET_PWR_CFG_FAB_MASK(PwrCfgCmd),
@@ -80,7 +81,7 @@ u8 HalPwrSeqCmdParsing(
 				RT_TRACE(
 					_module_hal_init_c_,
 					_drv_info_,
-					("HalPwrSeqCmdParsing: PWR_CMD_READ\n")
+					("%s: PWR_CMD_READ\n", __func__)
 				);
 				break;
 
@@ -88,7 +89,7 @@ u8 HalPwrSeqCmdParsing(
 				RT_TRACE(
 					_module_hal_init_c_,
 					_drv_info_,
-					("HalPwrSeqCmdParsing: PWR_CMD_WRITE\n")
+					("%s: PWR_CMD_WRITE\n", __func__)
 				);
 				offset = GET_PWR_CFG_OFFSET(PwrCfgCmd);
 
@@ -127,7 +128,7 @@ u8 HalPwrSeqCmdParsing(
 				RT_TRACE(
 					_module_hal_init_c_,
 					_drv_info_,
-					("HalPwrSeqCmdParsing: PWR_CMD_POLLING\n")
+					("%s: PWR_CMD_POLLING\n", __func__)
 				);
 
 				bPollingBit = false;
@@ -163,7 +164,7 @@ u8 HalPwrSeqCmdParsing(
 				RT_TRACE(
 					_module_hal_init_c_,
 					_drv_info_,
-					("HalPwrSeqCmdParsing: PWR_CMD_DELAY\n")
+					("%s: PWR_CMD_DELAY\n", __func__)
 				);
 				if (GET_PWR_CFG_VALUE(PwrCfgCmd) == PWRSEQ_DELAY_US)
 					udelay(GET_PWR_CFG_OFFSET(PwrCfgCmd));
@@ -176,7 +177,7 @@ u8 HalPwrSeqCmdParsing(
 				RT_TRACE(
 					_module_hal_init_c_,
 					_drv_info_,
-					("HalPwrSeqCmdParsing: PWR_CMD_END\n")
+					("%s: PWR_CMD_END\n", __func__)
 				);
 				return true;
 
@@ -184,7 +185,7 @@ u8 HalPwrSeqCmdParsing(
 				RT_TRACE(
 					_module_hal_init_c_,
 					_drv_err_,
-					("HalPwrSeqCmdParsing: Unknown CMD!!\n")
+					("%s: Unknown CMD!!\n", __func__)
 				);
 				break;
 			}
drivers/staging/rtl8723bs/hal/hal_com.c +3 -3
index bda4ca01e374..a7027ba54413 100644
@@ -687,7 +687,7 @@ u8 HwRateToMRate(u8 rate)
 		break;
 
 	default:
-		DBG_871X("HwRateToMRate(): Non supported Rate [%x]!!!\n", rate);
+		DBG_871X("%s(): Non supported Rate [%x]!!!\n", __func__, rate);
 		break;
 	}
 
@@ -1395,8 +1395,8 @@ bool GetHexValueFromString(char *szStr, u32 *pu4bVal, u32 *pu4bMove)
 
 	/*  Check input parameter. */
 	if (!szStr || !pu4bVal || !pu4bMove) {
-		DBG_871X("GetHexValueFromString(): Invalid input arguments! szStr: %p, pu4bVal: %p, pu4bMove: %p\n",
-			 szStr, pu4bVal, pu4bMove);
+		DBG_871X("%s(): Invalid input arguments! szStr: %p, pu4bVal: %p, pu4bMove: %p\n",
+			 __func__, szStr, pu4bVal, pu4bMove);
 		return false;
 	}
 
drivers/staging/rtl8723bs/hal/hal_com_phycfg.c +14 -14
index b4389771391a..5c62f14cfcfd 100644
@@ -18,7 +18,7 @@ u8 PHY_GetTxPowerByRateBase(struct adapter *Adapter, u8 Band, u8 RfPath,
 	u8	value = 0;
 
 	if (RfPath > ODM_RF_PATH_D) {
-		DBG_871X("Invalid Rf Path %d in PHY_GetTxPowerByRateBase()\n", RfPath);
+		DBG_871X("Invalid Rf Path %d in %s()\n", __func__, RfPath);
 		return 0;
 	}
 
@@ -55,8 +55,8 @@ u8 PHY_GetTxPowerByRateBase(struct adapter *Adapter, u8 Band, u8 RfPath,
 			value = pHalData->TxPwrByRateBase2_4G[RfPath][TxNum][9];
 			break;
 		default:
-			DBG_871X("Invalid RateSection %d in Band 2.4G, Rf Path %d, %dTx in PHY_GetTxPowerByRateBase()\n",
-					 RateSection, RfPath, TxNum);
+			DBG_871X("Invalid RateSection %d in Band 2.4G, Rf Path %d, %dTx in %s()\n",
+					 __func__, RateSection, RfPath, TxNum);
 			break;
 		}
 	} else if (Band == BAND_ON_5G) {
@@ -89,12 +89,12 @@ u8 PHY_GetTxPowerByRateBase(struct adapter *Adapter, u8 Band, u8 RfPath,
 			value = pHalData->TxPwrByRateBase5G[RfPath][TxNum][8];
 			break;
 		default:
-			DBG_871X("Invalid RateSection %d in Band 5G, Rf Path %d, %dTx in PHY_GetTxPowerByRateBase()\n",
-					 RateSection, RfPath, TxNum);
+			DBG_871X("Invalid RateSection %d in Band 5G, Rf Path %d, %dTx in %s()\n",
+					 __func__, RateSection, RfPath, TxNum);
 			break;
 		}
 	} else
-		DBG_871X("Invalid Band %d in PHY_GetTxPowerByRateBase()\n", Band);
+		DBG_871X("Invalid Band %d in %s()\n", __func__, Band);
 
 	return value;
 }
@@ -112,7 +112,7 @@ phy_SetTxPowerByRateBase(
 	struct hal_com_data	*pHalData = GET_HAL_DATA(Adapter);
 
 	if (RfPath > ODM_RF_PATH_D) {
-		DBG_871X("Invalid Rf Path %d in phy_SetTxPowerByRatBase()\n", RfPath);
+		DBG_871X("Invalid Rf Path %d in %s()\n", __func__, RfPath);
 		return;
 	}
 
@@ -149,8 +149,8 @@ phy_SetTxPowerByRateBase(
 			pHalData->TxPwrByRateBase2_4G[RfPath][TxNum][9] = Value;
 			break;
 		default:
-			DBG_871X("Invalid RateSection %d in Band 2.4G, Rf Path %d, %dTx in phy_SetTxPowerByRateBase()\n",
-					 RateSection, RfPath, TxNum);
+			DBG_871X("Invalid RateSection %d in Band 2.4G, Rf Path %d, %dTx in %s()\n",
+					 __func__, RateSection, RfPath, TxNum);
 			break;
 		}
 	} else if (Band == BAND_ON_5G) {
@@ -183,12 +183,12 @@ phy_SetTxPowerByRateBase(
 			pHalData->TxPwrByRateBase5G[RfPath][TxNum][8] = Value;
 			break;
 		default:
-			DBG_871X("Invalid RateSection %d in Band 5G, Rf Path %d, %dTx in phy_SetTxPowerByRateBase()\n",
-					 RateSection, RfPath, TxNum);
+			DBG_871X("Invalid RateSection %d in Band 5G, Rf Path %d, %dTx in %s()\n",
+					 __func__, RateSection, RfPath, TxNum);
 			break;
 		}
 	} else
-		DBG_871X("Invalid Band %d in phy_SetTxPowerByRateBase()\n", Band);
+		DBG_871X("Invalid Band %d in %s()\n", __func__, Band);
 }
 
 static void
@@ -325,7 +325,7 @@ u8 PHY_GetRateSectionIndexOfTxPowerByRate(
 			index = 13;
 			break;
 		default:
-			DBG_871X("Invalid RegAddr 0x3%x in PHY_GetRateSectionIndexOfTxPowerByRate()", RegAddr);
+			DBG_871X("Invalid RegAddr 0x3%x in %s()", __func__, RegAddr);
 			break;
 		}
 	}
@@ -1064,7 +1064,7 @@ u8 PHY_GetTxPowerIndexBase(
 		else if (Rate >= MGN_6M)
 			txPower = pHalData->Index24G_BW40_Base[RFPath][chnlIdx];
 		else
-			DBG_871X("PHY_GetTxPowerIndexBase: INVALID Rate.\n");
+			DBG_871X("%s: INVALID Rate.\n", __func__);
 
 		/* DBG_871X("Base Tx power(RF-%c, Rate #%d, Channel Index %d) = 0x%X\n", */
 		/*		((RFPath == 0)?'A':'B'), Rate, chnlIdx, txPower); */
drivers/staging/rtl8723bs/hal/hal_intf.c +2 -2
index ac3066a91c84..4808864f55f0 100644
@@ -105,7 +105,7 @@ uint rtw_hal_init(struct adapter *padapter)
 		rtw_bb_rf_gain_offset(padapter);
 	} else {
 		dvobj->padapters->hw_init_completed = false;
-		DBG_871X("rtw_hal_init: hal__init fail\n");
+		DBG_871X("%s: hal__init fail\n", __func__);
 	}
 
 	RT_TRACE(_module_hal_init_c_, _drv_err_, ("-rtl871x_hal_init:status = 0x%x\n", status));
@@ -125,7 +125,7 @@ uint rtw_hal_deinit(struct adapter *padapter)
 		padapter = dvobj->padapters;
 		padapter->hw_init_completed = false;
 	} else {
-		DBG_871X("\n rtw_hal_deinit: hal_init fail\n");
+		DBG_871X("\n %s: hal_init fail\n", __func__);
 	}
 	return status;
 }
drivers/staging/rtl8723bs/hal/odm.c +3 -3
index d6dd51aa446c..daa74ccee7e2 100644
@@ -866,7 +866,7 @@ void odm_CommonInfoSelfUpdate(PDM_ODM_T pDM_Odm)
 
 void odm_CmnInfoInit_Debug(PDM_ODM_T pDM_Odm)
 {
-	ODM_RT_TRACE(pDM_Odm, ODM_COMP_COMMON, ODM_DBG_LOUD, ("odm_CmnInfoInit_Debug ==>\n"));
+	ODM_RT_TRACE(pDM_Odm, ODM_COMP_COMMON, ODM_DBG_LOUD, ("%s ==>\n", __func__));
 	ODM_RT_TRACE(pDM_Odm, ODM_COMP_COMMON, ODM_DBG_LOUD, ("SupportPlatform =%d\n", pDM_Odm->SupportPlatform));
 	ODM_RT_TRACE(pDM_Odm, ODM_COMP_COMMON, ODM_DBG_LOUD, ("SupportAbility = 0x%x\n", pDM_Odm->SupportAbility));
 	ODM_RT_TRACE(pDM_Odm, ODM_COMP_COMMON, ODM_DBG_LOUD, ("SupportInterface =%d\n", pDM_Odm->SupportInterface));
@@ -1083,9 +1083,9 @@ u32 ODM_Get_Rate_Bitmap(
 void odm_RefreshRateAdaptiveMask(PDM_ODM_T pDM_Odm)
 {
 
-	ODM_RT_TRACE(pDM_Odm, ODM_COMP_RA_MASK, ODM_DBG_TRACE, ("odm_RefreshRateAdaptiveMask()---------->\n"));
+	ODM_RT_TRACE(pDM_Odm, ODM_COMP_RA_MASK, ODM_DBG_TRACE, ("%s()---------->\n", __func__));
 	if (!(pDM_Odm->SupportAbility & ODM_BB_RA_MASK)) {
-		ODM_RT_TRACE(pDM_Odm, ODM_COMP_RA_MASK, ODM_DBG_TRACE, ("odm_RefreshRateAdaptiveMask(): Return cos not supported\n"));
+		ODM_RT_TRACE(pDM_Odm, ODM_COMP_RA_MASK, ODM_DBG_TRACE, ("%s(): Return cos not supported\n", __func__));
 		return;
 	}
 	odm_RefreshRateAdaptiveMaskCE(pDM_Odm);
drivers/staging/rtl8723bs/hal/odm_CfoTracking.c +17 -14
index 3ea1972545e5..8cfb46380369 100644
@@ -31,8 +31,8 @@ static void odm_SetCrystalCap(void *pDM_VOID, u8 CrystalCap)
 		ODM_COMP_CFO_TRACKING,
 		ODM_DBG_LOUD,
 		(
-			"odm_SetCrystalCap(): CrystalCap = 0x%x\n",
-			CrystalCap
+			"%s(): CrystalCap = 0x%x\n",
+			__func__, CrystalCap
 		)
 	);
 }
@@ -131,7 +131,7 @@ void ODM_CfoTracking(void *pDM_VOID)
 			pDM_Odm,
 			ODM_COMP_CFO_TRACKING,
 			ODM_DBG_LOUD,
-			("ODM_CfoTracking(): Return: SupportAbility ODM_BB_CFO_TRACKING is disabled\n")
+			("%s(): Return: SupportAbility ODM_BB_CFO_TRACKING is disabled\n", __func__)
 		);
 		return;
 	}
@@ -140,7 +140,7 @@ void ODM_CfoTracking(void *pDM_VOID)
 		pDM_Odm,
 		ODM_COMP_CFO_TRACKING,
 		ODM_DBG_LOUD,
-		("ODM_CfoTracking() =========>\n")
+		("%s() =========>\n", __func__)
 	);
 
 	if (!pDM_Odm->bLinked || !pDM_Odm->bOneEntryOnly) {
@@ -151,7 +151,8 @@ void ODM_CfoTracking(void *pDM_VOID)
 			ODM_COMP_CFO_TRACKING,
 			ODM_DBG_LOUD,
 			(
-				"ODM_CfoTracking(): Reset: bLinked = %d, bOneEntryOnly = %d\n",
+				"%s(): Reset: bLinked = %d, bOneEntryOnly = %d\n",
+				__func__,
 				pDM_Odm->bLinked,
 				pDM_Odm->bOneEntryOnly
 			)
@@ -165,7 +166,7 @@ void ODM_CfoTracking(void *pDM_VOID)
 				ODM_COMP_CFO_TRACKING,
 				ODM_DBG_LOUD,
 				(
-					"ODM_CfoTracking(): packet counter doesn't change\n"
+					"%s(): packet counter doesn't change\n", __func__
 				)
 			);
 			return;
@@ -185,7 +186,8 @@ void ODM_CfoTracking(void *pDM_VOID)
 			ODM_COMP_CFO_TRACKING,
 			ODM_DBG_LOUD,
 			(
-				"ODM_CfoTracking(): CFO_kHz_A = %dkHz, CFO_kHz_B = %dkHz, CFO_ave = %dkHz\n",
+				"%s(): CFO_kHz_A = %dkHz, CFO_kHz_B = %dkHz, CFO_ave = %dkHz\n",
+				__func__,
 				CFO_kHz_A,
 				CFO_kHz_B,
 				CFO_ave
@@ -203,7 +205,7 @@ void ODM_CfoTracking(void *pDM_VOID)
 			pCfoTrack->largeCFOHit == 0 &&
 			!pCfoTrack->bAdjust
 		) {
-			ODM_RT_TRACE(pDM_Odm, ODM_COMP_CFO_TRACKING, ODM_DBG_LOUD, ("ODM_CfoTracking(): first large CFO hit\n"));
+			ODM_RT_TRACE(pDM_Odm, ODM_COMP_CFO_TRACKING, ODM_DBG_LOUD, ("%s(): first large CFO hit\n", __func__));
 			pCfoTrack->largeCFOHit = 1;
 			return;
 		} else
@@ -227,7 +229,7 @@ void ODM_CfoTracking(void *pDM_VOID)
 				pDM_Odm,
 				ODM_COMP_CFO_TRACKING,
 				ODM_DBG_LOUD,
-				("ODM_CfoTracking(): Disable CFO tracking for BT!!\n")
+				("%s(): Disable CFO tracking for BT!!\n", __func__)
 			);
 		}
 
@@ -243,8 +245,8 @@ void ODM_CfoTracking(void *pDM_VOID)
 				ODM_COMP_CFO_TRACKING,
 				ODM_DBG_LOUD,
 				(
-					"ODM_CfoTracking(): Crystal cap offset = %d\n",
-					Adjust_Xtal
+					"%s(): Crystal cap offset = %d\n",
+					__func__, Adjust_Xtal
 				)
 			);
 		}
@@ -268,7 +270,8 @@ void ODM_CfoTracking(void *pDM_VOID)
 			ODM_COMP_CFO_TRACKING,
 			ODM_DBG_LOUD,
 			(
-				"ODM_CfoTracking(): Crystal cap = 0x%x, Default Crystal cap = 0x%x\n",
+				"%s(): Crystal cap = 0x%x, Default Crystal cap = 0x%x\n",
+				__func__,
 				pCfoTrack->CrystalCap,
 				pCfoTrack->DefXCap
 			)
@@ -281,7 +284,7 @@ void ODM_CfoTracking(void *pDM_VOID)
 				pDM_Odm,
 				ODM_COMP_CFO_TRACKING,
 				ODM_DBG_LOUD,
-				("ODM_CfoTracking(): Disable ATC!!\n")
+				("%s(): Disable ATC!!\n", __func__)
 			);
 		} else {
 			odm_SetATCStatus(pDM_Odm, true);
@@ -289,7 +292,7 @@ void ODM_CfoTracking(void *pDM_VOID)
 				pDM_Odm,
 				ODM_COMP_CFO_TRACKING,
 				ODM_DBG_LOUD,
-				("ODM_CfoTracking(): Enable ATC!!\n")
+				("%s(): Enable ATC!!\n", __func__)
 			);
 		}
 	}
drivers/staging/rtl8723bs/hal/odm_DIG.c +45 -40

285 lines not on this page · raw message

drivers/staging/rtl8723bs/hal/odm_EdcaTurboCheck.c +2 -2
index b7ebce7a6ff9..1152fab3ce45 100644
@@ -61,14 +61,14 @@ void odm_EdcaTurboCheck(void *pDM_VOID)
 	PDM_ODM_T		pDM_Odm = (PDM_ODM_T)pDM_VOID;
 
 	ODM_RT_TRACE(pDM_Odm, ODM_COMP_EDCA_TURBO, ODM_DBG_LOUD,
-		     ("odm_EdcaTurboCheck ========================>\n"));
+		     ("%s ========================>\n", __func__));
 
 	if (!(pDM_Odm->SupportAbility & ODM_MAC_EDCA_TURBO))
 		return;
 
 	odm_EdcaTurboCheckCE(pDM_Odm);
 	ODM_RT_TRACE(pDM_Odm, ODM_COMP_EDCA_TURBO, ODM_DBG_LOUD,
-		     ("<========================odm_EdcaTurboCheck\n"));
+		     ("<========================%s\n", __func__));
 }	/*  odm_CheckEdcaTurbo */
 
 void odm_EdcaTurboCheckCE(void *pDM_VOID)
drivers/staging/rtl8723bs/hal/odm_HWConfig.c +3 -3
index 9c190b1024d8..8932ba504764 100644
@@ -437,7 +437,7 @@ HAL_STATUS ODM_ConfigRFWithHeaderFile(
 )
 {
 	ODM_RT_TRACE(pDM_Odm, ODM_COMP_INIT, ODM_DBG_LOUD,
-				("===>ODM_ConfigRFWithHeaderFile (%s)\n", (pDM_Odm->bIsMPChip) ? "MPChip" : "TestChip"));
+				("===>%s (%s)\n", __func__, (pDM_Odm->bIsMPChip) ? "MPChip" : "TestChip"));
 	ODM_RT_TRACE(pDM_Odm, ODM_COMP_INIT, ODM_DBG_LOUD,
 				("pDM_Odm->SupportPlatform: 0x%X, pDM_Odm->SupportInterface: 0x%X, pDM_Odm->BoardType: 0x%X\n",
 				pDM_Odm->SupportPlatform, pDM_Odm->SupportInterface, pDM_Odm->BoardType));
@@ -453,7 +453,7 @@ HAL_STATUS ODM_ConfigRFWithHeaderFile(
 HAL_STATUS ODM_ConfigRFWithTxPwrTrackHeaderFile(PDM_ODM_T pDM_Odm)
 {
 	ODM_RT_TRACE(pDM_Odm, ODM_COMP_INIT, ODM_DBG_LOUD,
-				 ("===>ODM_ConfigRFWithTxPwrTrackHeaderFile (%s)\n", (pDM_Odm->bIsMPChip) ? "MPChip" : "TestChip"));
+				 ("===>%s (%s)\n", __func__, (pDM_Odm->bIsMPChip) ? "MPChip" : "TestChip"));
 	ODM_RT_TRACE(pDM_Odm, ODM_COMP_INIT, ODM_DBG_LOUD,
 				 ("pDM_Odm->SupportPlatform: 0x%X, pDM_Odm->SupportInterface: 0x%X, pDM_Odm->BoardType: 0x%X\n",
 				 pDM_Odm->SupportPlatform, pDM_Odm->SupportInterface, pDM_Odm->BoardType));
@@ -469,7 +469,7 @@ HAL_STATUS ODM_ConfigBBWithHeaderFile(
 )
 {
 	ODM_RT_TRACE(pDM_Odm, ODM_COMP_INIT, ODM_DBG_LOUD,
-				("===>ODM_ConfigBBWithHeaderFile (%s)\n", (pDM_Odm->bIsMPChip) ? "MPChip" : "TestChip"));
+				("===>%s (%s)\n", __func__, (pDM_Odm->bIsMPChip) ? "MPChip" : "TestChip"));
 	ODM_RT_TRACE(pDM_Odm, ODM_COMP_INIT, ODM_DBG_LOUD,
 				("pDM_Odm->SupportPlatform: 0x%X, pDM_Odm->SupportInterface: 0x%X, pDM_Odm->BoardType: 0x%X\n",
 				pDM_Odm->SupportPlatform, pDM_Odm->SupportInterface, pDM_Odm->BoardType));
drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +17 -14
index 1effbc6aa008..3b845138efcf 100644
@@ -69,7 +69,8 @@ static int _BlockWrite(struct adapter *padapter, void *buffer, u32 buffSize)
 			_module_hal_init_c_,
 			_drv_notice_,
 			(
-				"_BlockWrite: [P1] buffSize(%d) blockSize_p1(%d) blockCount_p1(%d) remainSize_p1(%d)\n",
+				"%s: [P1] buffSize(%d) blockSize_p1(%d) blockCount_p1(%d) remainSize_p1(%d)\n",
+				__func__,
 				buffSize,
 				blockSize_p1,
 				blockCount_p1,
@@ -98,7 +99,8 @@ static int _BlockWrite(struct adapter *padapter, void *buffer, u32 buffSize)
 					_module_hal_init_c_,
 					_drv_notice_,
 					(
-						"_BlockWrite: [P2] buffSize_p2(%d) blockSize_p2(%d) blockCount_p2(%d) remainSize_p2(%d)\n",
+						"%s: [P2] buffSize_p2(%d) blockSize_p2(%d) blockCount_p2(%d) remainSize_p2(%d)\n",
+						__func__,
 						(buffSize-offset),
 						blockSize_p2,
 						blockCount_p2,
@@ -116,7 +118,7 @@ static int _BlockWrite(struct adapter *padapter, void *buffer, u32 buffSize)
 		blockCount_p3 = remainSize_p2 / blockSize_p3;
 
 		RT_TRACE(_module_hal_init_c_, _drv_notice_,
-				("_BlockWrite: [P3] buffSize_p3(%d) blockSize_p3(%d) blockCount_p3(%d)\n",
+				("%s: [P3] buffSize_p3(%d) blockSize_p3(%d) blockCount_p3(%d)\n", __func__,
 				(buffSize-offset), blockSize_p3, blockCount_p3));
 
 		for (i = 0; i < blockCount_p3; i++) {
@@ -181,7 +183,7 @@ static int _WriteFW(struct adapter *padapter, void *buffer, u32 size)
 			goto exit;
 		}
 	}
-	RT_TRACE(_module_hal_init_c_, _drv_info_, ("_WriteFW Done- for Normal chip.\n"));
+	RT_TRACE(_module_hal_init_c_, _drv_info_, ("%s Done- for Normal chip.\n", __func__));
 
 exit:
 	return ret;
@@ -512,7 +514,7 @@ s32 rtl8723b_FirmwareDownload(struct adapter *padapter, bool  bUsedWoWLANFw)
 	kfree(pFirmware);
 release_fw1:
 	kfree(pBTFirmware);
-	DBG_871X(" <=== rtl8723b_FirmwareDownload()\n");
+	DBG_871X(" <=== %s()\n", __func__);
 	return rtStatus;
 }
 
@@ -554,10 +556,10 @@ void SetFwRelatedForWoWLAN8723b(
 	/*  */
 	status = rtl8723b_FirmwareDownload(padapter, bHostIsGoingtoSleep);
 	if (status != _SUCCESS) {
-		DBG_871X("SetFwRelatedForWoWLAN8723b(): Re-Download Firmware failed!!\n");
+		DBG_871X("%s(): Re-Download Firmware failed!!\n", __func__);
 		return;
 	} else {
-		DBG_871X("SetFwRelatedForWoWLAN8723b(): Re-Download Firmware Success !!\n");
+		DBG_871X("%s(): Re-Download Firmware Success !!\n", __func__);
 	}
 	/*  */
 	/*  2. Re-Init the variables about Fw related setting. */
@@ -1991,7 +1993,7 @@ static void ResumeTxBeacon(struct adapter *padapter)
 	/*  2010.03.01. Marked by tynli. No need to call workitem beacause we record the value */
 	/*  which should be read from register to a global variable. */
 
-	RT_TRACE(_module_hci_hal_init_c_, _drv_info_, ("+ResumeTxBeacon\n"));
+	RT_TRACE(_module_hci_hal_init_c_, _drv_info_, ("+%s\n", __func__));
 
 	pHalData->RegFwHwTxQCtrl |= BIT(6);
 	rtw_write8(padapter, REG_FWHW_TXQ_CTRL+2, pHalData->RegFwHwTxQCtrl);
@@ -2008,7 +2010,7 @@ static void StopTxBeacon(struct adapter *padapter)
 	/*  2010.03.01. Marked by tynli. No need to call workitem beacause we record the value */
 	/*  which should be read from register to a global variable. */
 
-	RT_TRACE(_module_hci_hal_init_c_, _drv_info_, ("+StopTxBeacon\n"));
+	RT_TRACE(_module_hci_hal_init_c_, _drv_info_, ("+%s\n", __func__));
 
 	pHalData->RegFwHwTxQCtrl &= ~BIT(6);
 	rtw_write8(padapter, REG_FWHW_TXQ_CTRL+2, pHalData->RegFwHwTxQCtrl);
@@ -2362,7 +2364,7 @@ static bool Hal_GetChnlGroup8723B(u8 Channel, u8 *pGroup)
 		else if (Channel >= 12 && Channel <= 14)
 			*pGroup = 4;
 		else
-			RT_TRACE(_module_hci_hal_init_c_, _drv_notice_, ("==>Hal_GetChnlGroup8723B in 2.4 G, but Channel %d in Group not found\n", Channel));
+			RT_TRACE(_module_hci_hal_init_c_, _drv_notice_, ("==>%s in 2.4 G, but Channel %d in Group not found\n", __func__, Channel));
 	} else {
 		bIn24G = false;
 
@@ -2395,14 +2397,15 @@ static bool Hal_GetChnlGroup8723B(u8 Channel, u8 *pGroup)
 		else if (Channel >= 173 && Channel <= 177)
 			*pGroup = 13;
 		else
-			RT_TRACE(_module_hci_hal_init_c_, _drv_notice_, ("==>Hal_GetChnlGroup8723B in 5G, but Channel %d in Group not found\n", Channel));
+			RT_TRACE(_module_hci_hal_init_c_, _drv_notice_, ("==>%s in 5G, but Channel %d in Group not found\n", __func__, Channel));
 
 	}
 	RT_TRACE(
 		_module_hci_hal_init_c_,
 		_drv_info_,
 		(
-			"<==Hal_GetChnlGroup8723B,  (%s) Channel = %d, Group =%d,\n",
+			"<==%s,  (%s) Channel = %d, Group =%d,\n",
+			__func__,
 			bIn24G ? "2.4G" : "5G",
 			Channel,
 			*pGroup
@@ -3657,7 +3660,7 @@ s32 c2h_handler_8723b(struct adapter *padapter, u8 *buf)
 		break;
 	case C2H_DBG:
 		{
-			RT_TRACE(_module_hal_init_c_, _drv_info_, ("c2h_handler_8723b: %s\n", pC2hEvent->payload));
+			RT_TRACE(_module_hal_init_c_, _drv_info_, ("%s: %s\n", __func__, pC2hEvent->payload));
 		}
 		break;
 
@@ -3751,7 +3754,7 @@ void C2HPacketHandler_8723B(struct adapter *padapter, u8 *pbuffer, u16 length)
 
 	/* DBG_871X("%s C2hEvent.CmdID:%x C2hEvent.CmdLen:%x C2hEvent.CmdSeq:%x\n", */
 	/*		__func__, C2hEvent.CmdID, C2hEvent.CmdLen, C2hEvent.CmdSeq); */
-	RT_PRINT_DATA(_module_hal_init_c_, _drv_notice_, "C2HPacketHandler_8723B(): Command Content:\n", tmpBuf, C2hEvent.CmdLen);
+	RT_PRINT_DATA(_module_hal_init_c_, _drv_notice_, "%s(): Command Content:\n", __func__, tmpBuf, C2hEvent.CmdLen);
 
 	process_c2h_event(padapter, &C2hEvent, tmpBuf);
 	/* c2h_handler_8723b(padapter,&C2hEvent); */
drivers/staging/rtl8723bs/hal/rtl8723b_phycfg.c +3 -3
index a72ed64e5d99..db41a5e8d847 100644
@@ -659,11 +659,11 @@ void PHY_SetTxPowerLevel8723B(struct adapter *Adapter, u8 Channel)
 		RFPath = pHalData->ant_path;
 	}
 
-	RT_TRACE(_module_hal_init_c_, _drv_info_, ("==>PHY_SetTxPowerLevel8723B()\n"));
+	RT_TRACE(_module_hal_init_c_, _drv_info_, ("==>%s()\n", __func__));
 
 	PHY_SetTxPowerLevelByPath(Adapter, Channel, RFPath);
 
-	RT_TRACE(_module_hal_init_c_, _drv_info_, ("<==PHY_SetTxPowerLevel8723B()\n"));
+	RT_TRACE(_module_hal_init_c_, _drv_info_, ("<==%s()\n", __func__));
 }
 
 void PHY_GetTxPowerLevel8723B(struct adapter *Adapter, s32 *powerlevel)
@@ -834,7 +834,7 @@ static void phy_SwChnl8723B(struct adapter *padapter)
 	PHY_SetRFReg(padapter, ODM_RF_PATH_A, RF_CHNLBW, 0x3FF, pHalData->RfRegChnlVal[0]);
 	PHY_SetRFReg(padapter, ODM_RF_PATH_B, RF_CHNLBW, 0x3FF, pHalData->RfRegChnlVal[0]);
 
-	DBG_8192C("===>phy_SwChnl8723B: Channel = %d\n", channelToSW);
+	DBG_8192C("===>%s: Channel = %d\n", __func__, channelToSW);
 }
 
 static void phy_SwChnlAndSetBwMode8723B(struct adapter *Adapter)
drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c +1 -1
index 36a80533444e..6b07bd104a91 100644
@@ -572,7 +572,7 @@ s32 rtl8723bs_hal_xmit(
 	err = rtw_xmitframe_enqueue(padapter, pxmitframe);
 	spin_unlock_bh(&pxmitpriv->lock);
 	if (err != _SUCCESS) {
-		RT_TRACE(_module_hal_xmit_c_, _drv_err_, ("rtl8723bs_hal_xmit: enqueue xmitframe fail\n"));
+		RT_TRACE(_module_hal_xmit_c_, _drv_err_, ("%s: enqueue xmitframe fail\n", __func__));
 		rtw_free_xmitframe(pxmitpriv, pxmitframe);
 
 		pxmitpriv->tx_drop++;
drivers/staging/rtl8723bs/hal/sdio_halinit.c +9 -9
index 4a7a0ade29d2..0e7d8865e229 100644
@@ -686,7 +686,7 @@ static bool HalDetectPwrDownMode(struct adapter *Adapter)
 	else
 		pHalData->pwrdown = false;
 
-	DBG_8192C("HalDetectPwrDownMode(): PDN =%d\n", pHalData->pwrdown);
+	DBG_8192C("%s(): PDN =%d\n", __func__, pHalData->pwrdown);
 
 	return pHalData->pwrdown;
 }	/*  HalDetectPwrDownMode */
@@ -792,7 +792,7 @@ static u32 rtl8723bs_hal_init(struct adapter *padapter)
 		pHalData->fw_ractrl = false;
 		return ret;
 	} else {
-		RT_TRACE(_module_hci_hal_init_c_, _drv_notice_, ("rtl8723bs_hal_init(): Download Firmware Success!!\n"));
+		RT_TRACE(_module_hci_hal_init_c_, _drv_notice_, ("%s(): Download Firmware Success!!\n", __func__));
 		padapter->bFWReady = true;
 		pHalData->fw_ractrl = true;
 	}
@@ -1127,9 +1127,9 @@ static u32 rtl8723bs_inirp_init(struct adapter *padapter)
 
 static u32 rtl8723bs_inirp_deinit(struct adapter *padapter)
 {
-	RT_TRACE(_module_hci_hal_init_c_, _drv_info_, ("+rtl8723bs_inirp_deinit\n"));
+	RT_TRACE(_module_hci_hal_init_c_, _drv_info_, ("+%s\n", __func__));
 
-	RT_TRACE(_module_hci_hal_init_c_, _drv_info_, ("-rtl8723bs_inirp_deinit\n"));
+	RT_TRACE(_module_hci_hal_init_c_, _drv_info_, ("-%s\n", __func__));
 
 	return _SUCCESS;
 }
@@ -1233,7 +1233,7 @@ static void Hal_EfuseParseMACAddr_8723BS(
 		_module_hci_hal_init_c_,
 		_drv_notice_,
 		(
-			"Hal_EfuseParseMACAddr_8723BS: Permanent Address = %02x-%02x-%02x-%02x-%02x-%02x\n",
+			"%s: Permanent Address = %02x-%02x-%02x-%02x-%02x-%02x\n", __func__,
 			pEEPROM->mac_addr[0],
 			pEEPROM->mac_addr[1],
 			pEEPROM->mac_addr[2],
@@ -1264,7 +1264,7 @@ static void _ReadEfuseInfo8723BS(struct adapter *padapter)
 	struct eeprom_priv *pEEPROM = GET_EEPROM_EFUSE_PRIV(padapter);
 	u8 *hwinfo = NULL;
 
-	RT_TRACE(_module_hci_hal_init_c_, _drv_info_, ("====>_ReadEfuseInfo8723BS()\n"));
+	RT_TRACE(_module_hci_hal_init_c_, _drv_info_, ("====>%s()\n", __func__));
 
 	/*  */
 	/*  This part read and parse the eeprom/efuse content */
@@ -1304,7 +1304,7 @@ static void _ReadEfuseInfo8723BS(struct adapter *padapter)
 
 	Hal_ReadRFGainOffset(padapter, hwinfo, pEEPROM->bautoload_fail_flag);
 
-	RT_TRACE(_module_hci_hal_init_c_, _drv_info_, ("<==== _ReadEfuseInfo8723BS()\n"));
+	RT_TRACE(_module_hci_hal_init_c_, _drv_info_, ("<==== %s()\n", __func__));
 }
 
 static void _ReadPROMContent(struct adapter *padapter)
@@ -1345,7 +1345,7 @@ static s32 _ReadAdapterInfo8723BS(struct adapter *padapter)
 	u8 val8;
 	unsigned long start;
 
-	RT_TRACE(_module_hci_hal_init_c_, _drv_info_, ("+_ReadAdapterInfo8723BS\n"));
+	RT_TRACE(_module_hci_hal_init_c_, _drv_info_, ("+%s\n", __func__));
 
 	/*  before access eFuse, make sure card enable has been called */
 	if (!padapter->hw_init_completed)
@@ -1371,7 +1371,7 @@ static s32 _ReadAdapterInfo8723BS(struct adapter *padapter)
 	}
 
 
-	MSG_8192C("<==== _ReadAdapterInfo8723BS in %d ms\n", jiffies_to_msecs(jiffies - start));
+	MSG_8192C("<==== %s in %d ms\n", __func__, jiffies_to_msecs(jiffies - start));
 
 	return _SUCCESS;
 }
Signature · 1 line
2.25.1