wlan: dxe: fix logging format/argument mismatch
Source code analysis uncovered mismatches between format and argument
in invocations of HDXE_MSG() in the dxe code, so fix them.
Change-Id: I94aab941b5d92a0d87b5694304e5b63dcfcde7b0
CRs-fixed: 570511
diff --git a/CORE/DXE/src/wlan_qct_dxe.c b/CORE/DXE/src/wlan_qct_dxe.c
index 6bd37c8..d432683 100644
--- a/CORE/DXE/src/wlan_qct_dxe.c
+++ b/CORE/DXE/src/wlan_qct_dxe.c
@@ -560,8 +560,7 @@
}
HDXE_MSG(eWLAN_MODULE_DAL_DATA, eWLAN_PAL_TRACE_LEVEL_FATAL,
- "================== DXE Dump End ======================",
- tempDxeCtrlBlk->hostPowerState, tempDxeCtrlBlk->rivaPowerState);
+ "================== DXE Dump End ======================");
wpalMemoryFree(msgPtr);
#ifdef FEATURE_WLAN_DIAG_SUPPORT
@@ -629,7 +628,7 @@
{
HDXE_MSG(eWLAN_MODULE_DAL_DATA, eWLAN_PAL_TRACE_LEVEL_ERROR,
"Tx thread state dump req serialize fail status=%d",
- status, 0, 0);
+ status);
}
HDXE_MSG(eWLAN_MODULE_DAL_DATA, eWLAN_PAL_TRACE_LEVEL_INFO_LOW,
@@ -685,7 +684,7 @@
HDXE_MSG(eWLAN_MODULE_DAL_DATA, eWLAN_PAL_TRACE_LEVEL_WARN,
"Scheduled RX, num free BD/PDU %d, loop Count %d",
- regValue, hwWakeLoop, 0);
+ regValue, hwWakeLoop);
for(chLoop = WDTS_CHANNEL_RX_LOW_PRI; chLoop < WDTS_CHANNEL_MAX; chLoop++)
{
@@ -717,7 +716,7 @@
testCHCtrlBlk->tailCtrlBlk->ctrlBlkOrder, testCHCtrlBlk->tailCtrlBlk->linkedDescPhyAddr,
testCHCtrlBlk->tailCtrlBlk->linkedDesc->descCtrl.ctrl);
HDXE_MSG(eWLAN_MODULE_DAL_DATA, eWLAN_PAL_TRACE_LEVEL_WARN,
- "%11s : RX CH EN Descriptor Async, resync it", channelType[chLoop], 0, 0);
+ "%11s : RX CH EN Descriptor Async, resync it", channelType[chLoop]);
wpalWriteRegister(testCHCtrlBlk->channelRegister.chDXELstDesclRegAddr,
testCHCtrlBlk->headCtrlBlk->linkedDescPhyAddr);
}
@@ -734,7 +733,7 @@
testCHCtrlBlk->tailCtrlBlk->ctrlBlkOrder, testCHCtrlBlk->tailCtrlBlk->linkedDescPhyAddr,
testCHCtrlBlk->tailCtrlBlk->linkedDesc->descCtrl.ctrl);
HDXE_MSG(eWLAN_MODULE_DAL_DATA, eWLAN_PAL_TRACE_LEVEL_WARN,
- "%11s : RX CH DIS Descriptor Async, resync it", channelType[chLoop], 0, 0);
+ "%11s : RX CH DIS Descriptor Async, resync it", channelType[chLoop]);
wpalWriteRegister(testCHCtrlBlk->channelRegister.chDXEDesclRegAddr,
testCHCtrlBlk->headCtrlBlk->linkedDescPhyAddr);
}
@@ -745,7 +744,7 @@
{
HDXE_MSG(eWLAN_MODULE_DAL_DATA, eWLAN_PAL_TRACE_LEVEL_WARN,
"%11s : Still Low Resource, kick DXE TX and restart timer",
- channelType[channelCtrlBlk->channelType], 0, 0);
+ channelType[channelCtrlBlk->channelType]);
/* Still Low Resource, Kick DXE again and start timer again */
wpalTimerStart(&channelCtrlBlk->healthMonitorTimer,
T_WLANDXE_PERIODIC_HEALTH_M_TIME);
@@ -754,7 +753,7 @@
{
HDXE_MSG(eWLAN_MODULE_DAL_DATA, eWLAN_PAL_TRACE_LEVEL_WARN,
"%11s : Out from Low resource condition, do nothing",
- channelType[channelCtrlBlk->channelType], 0, 0);
+ channelType[channelCtrlBlk->channelType]);
/* Recovered from low resource condition
* Not need to do anything */
}
@@ -809,14 +808,14 @@
{
HDXE_MSG(eWLAN_MODULE_DAL_DATA, eWLAN_PAL_TRACE_LEVEL_WARN,
"num free BD/PDU %d, loop Count %d",
- regValue, hwWakeLoop, 0);
+ regValue, hwWakeLoop);
break;
}
}
HDXE_MSG(eWLAN_MODULE_DAL_DATA, eWLAN_PAL_TRACE_LEVEL_WARN,
"Scheduled TX, num free BD/PDU %d, loop Count %d",
- regValue, hwWakeLoop, 0);
+ regValue, hwWakeLoop);
for(chLoop = 0; chLoop < WDTS_CHANNEL_RX_LOW_PRI; chLoop++)
{
@@ -848,7 +847,7 @@
testCHCtrlBlk->tailCtrlBlk->ctrlBlkOrder, testCHCtrlBlk->tailCtrlBlk->linkedDescPhyAddr,
testCHCtrlBlk->tailCtrlBlk->linkedDesc->descCtrl.ctrl);
HDXE_MSG(eWLAN_MODULE_DAL_DATA, eWLAN_PAL_TRACE_LEVEL_WARN,
- "%11s : TX CH EN Descriptor Async, resync it", channelType[chLoop], 0, 0);
+ "%11s : TX CH EN Descriptor Async, resync it", channelType[chLoop]);
wpalWriteRegister(testCHCtrlBlk->channelRegister.chDXELstDesclRegAddr,
testCHCtrlBlk->tailCtrlBlk->linkedDescPhyAddr);
}
@@ -865,7 +864,7 @@
testCHCtrlBlk->tailCtrlBlk->ctrlBlkOrder, testCHCtrlBlk->tailCtrlBlk->linkedDescPhyAddr,
testCHCtrlBlk->tailCtrlBlk->linkedDesc->descCtrl.ctrl);
HDXE_MSG(eWLAN_MODULE_DAL_DATA, eWLAN_PAL_TRACE_LEVEL_WARN,
- "%11s : TX CH DIS Descriptor Async, resync it", channelType[chLoop], 0, 0);
+ "%11s : TX CH DIS Descriptor Async, resync it", channelType[chLoop]);
wpalWriteRegister(testCHCtrlBlk->channelRegister.chDXEDesclRegAddr,
testCHCtrlBlk->tailCtrlBlk->linkedDescPhyAddr);
}
@@ -879,8 +878,8 @@
if (eWLAN_PAL_STATUS_SUCCESS != status)
{
HDXE_MSG(eWLAN_MODULE_DAL_DATA, eWLAN_PAL_TRACE_LEVEL_ERROR,
- "TX Low resource Kick DXE MSG Serialize fail",
- status, 0, 0);
+ "TX Low resource Kick DXE MSG Serialize fail status=%d",
+ status);
}
return;
@@ -920,7 +919,7 @@
channelCtrlBlk = (WLANDXE_ChannelCBType *)channelCtxt;
HDXE_MSG(eWLAN_MODULE_DAL_DATA, eWLAN_PAL_TRACE_LEVEL_INFO,
"%11s : Health Monitor timer expired",
- channelType[channelCtrlBlk->channelType], 0, 0);
+ channelType[channelCtrlBlk->channelType]);
channelCtrlBlk->healthMonitorMsg->callback = dxeTXHealthMonitor;
status = wpalPostTxMsg(WDI_GET_PAL_CTX(),
@@ -928,8 +927,8 @@
if (eWLAN_PAL_STATUS_SUCCESS != status)
{
HDXE_MSG(eWLAN_MODULE_DAL_DATA, eWLAN_PAL_TRACE_LEVEL_ERROR,
- "TX Low resource Kick DXE MSG Serialize fail",
- status, 0, 0);
+ "TX Low resource Kick DXE MSG Serialize fail status=%d",
+ status);
}
return;
@@ -1120,7 +1119,7 @@
// descriptors were allocated in a chunk -- use the current one
memset((wpt_uint8 *)currentDesc, 0, sizeof(WLANDXE_DescType));
HDXE_MSG(eWLAN_MODULE_DAL_DATA, eWLAN_PAL_TRACE_LEVEL_INFO_LOW,
- "Allocated Descriptor VA 0x%x, PA 0x%x", currentDesc, physAddress);
+ "Allocated Descriptor VA %p, PA %p", currentDesc, physAddress);
#else
if(WDTS_CHANNEL_H2H_TEST_RX != channelEntry->channelType)
{
@@ -1141,14 +1140,14 @@
currentDesc = (WLANDXE_DescType *)wpalAcpuDdrDxeDescMemoryAllocate(&physAddress);
memset((wpt_uint8 *)currentDesc, 0, sizeof(WLANDXE_DescType));
HDXE_MSG(eWLAN_MODULE_DAL_DATA, eWLAN_PAL_TRACE_LEVEL_INFO_LOW,
- "Allocated Descriptor VA 0x%x, PA 0x%x", currentDesc, physAddress);
+ "Allocated Descriptor VA %p, PA %p", currentDesc, physAddress);
#else
if(WDTS_CHANNEL_H2H_TEST_RX != channelEntry->channelType)
{
currentDesc = (WLANDXE_DescType *)wpalAcpuDdrDxeDescMemoryAllocate(&physAddress);
memset((wpt_uint8 *)currentDesc, 0, sizeof(WLANDXE_DescType));
HDXE_MSG(eWLAN_MODULE_DAL_DATA, eWLAN_PAL_TRACE_LEVEL_INFO_LOW,
- "Allocated Descriptor VA 0x%x, PA 0x%x", currentDesc, physAddress);
+ "Allocated Descriptor VA %p, PA %p", currentDesc, physAddress);
}
else
{
@@ -5175,7 +5174,7 @@
{
HDXE_MSG(eWLAN_MODULE_DAL_DATA, eWLAN_PAL_TRACE_LEVEL_ERROR,
"Tx thread Set power state req serialize fail status=%d",
- status, 0, 0);
+ status);
}
HDXE_MSG(eWLAN_MODULE_DAL_DATA, eWLAN_PAL_TRACE_LEVEL_INFO_LOW,
@@ -5214,7 +5213,7 @@
if(NULL == pDXEContext)
{
HDXE_MSG(eWLAN_MODULE_DAL_DATA, eWLAN_PAL_TRACE_LEVEL_ERROR,
- "NULL pDXEContext passed by caller", 0, 0, 0);
+ "NULL pDXEContext passed by caller");
return eWLAN_PAL_STATUS_E_FAILURE;
}
pDxeCtrlBlk = (WLANDXE_CtrlBlkType *)pDXEContext;
@@ -5296,7 +5295,7 @@
{
HDXE_MSG(eWLAN_MODULE_DAL_DATA, eWLAN_PAL_TRACE_LEVEL_ERROR,
"Rx thread Set power state req serialize fail status=%d",
- status, 0, 0);
+ status);
}
}
else
@@ -5380,7 +5379,7 @@
if(NULL == pDXEContext)
{
HDXE_MSG(eWLAN_MODULE_DAL_DATA, eWLAN_PAL_TRACE_LEVEL_ERROR,
- "NULL parameter passed by caller", 0, 0, 0);
+ "NULL parameter passed by caller");
return (0);
}
@@ -5452,7 +5451,7 @@
{
HDXE_MSG(eWLAN_MODULE_DAL_DATA, eWLAN_PAL_TRACE_LEVEL_ERROR,
"Tx thread Set power state req serialize fail status=%d",
- status, 0, 0);
+ status);
}
}
@@ -5460,8 +5459,7 @@
if(enableStallDetect)
{
HDXE_MSG(eWLAN_MODULE_DAL_DATA, eWLAN_PAL_TRACE_LEVEL_WARN,
- "DXE TX Stall detect",
- 0, 0, 0);
+ "DXE TX Stall detect");
/* Start Stall detect timer and detect stall */
wpalTimerStart(&tempDxeCtrlBlk->dxeChannel[WDTS_CHANNEL_TX_LOW_PRI].healthMonitorTimer,
T_WLANDXE_PERIODIC_HEALTH_M_TIME);