wlan: Fix (-1) return values to conform to quic kernel coding standard
Change-Id: I055655e1c31ef30dd4fd329e2eb0187811bf6d48
CR-Fixed: NA
diff --git a/CORE/DXE/src/wlan_qct_dxe.c b/CORE/DXE/src/wlan_qct_dxe.c
index a267d5f..6d30e73 100644
--- a/CORE/DXE/src/wlan_qct_dxe.c
+++ b/CORE/DXE/src/wlan_qct_dxe.c
@@ -2025,7 +2025,7 @@
WLANDXE_ChannelCBType *channelEntry
Channel specific control block
@ Return
- -1 Any error happen
+ < 0 Any error happen
0 No frame pulled from RX RING
int number of RX frames pulled from RX ring
@@ -2040,6 +2040,7 @@
WLANDXE_DescCtrlBlkType *currentCtrlBlk = NULL;
WLANDXE_DescType *currentDesc = NULL;
wpt_uint32 descCtrl, frameCount = 0, i;
+ wpt_int32 ret_val = -1;
currentCtrlBlk = channelEntry->headCtrlBlk;
currentDesc = currentCtrlBlk->linkedDesc;
@@ -2067,14 +2068,14 @@
{
HDXE_MSG(eWLAN_MODULE_DAL_DATA, eWLAN_PAL_TRACE_LEVEL_ERROR,
"dxeRXFrameReady Prepare RX Frame fail");
- return -1;
+ return ret_val;
}
status = wpalFreeRxFrame(currentCtrlBlk->shadowBufferVa);
if(eWLAN_PAL_STATUS_SUCCESS != status)
{
HDXE_MSG(eWLAN_MODULE_DAL_DATA, eWLAN_PAL_TRACE_LEVEL_ERROR,
"dxeRXFrameReady Free Shadow RX Frame fail");
- return -1;
+ return ret_val;
}
#else /* FEATURE_R33D */
@@ -2083,7 +2084,7 @@
{
HDXE_MSG(eWLAN_MODULE_DAL_DATA, eWLAN_PAL_TRACE_LEVEL_ERROR,
"dxeRXFrameReady unable to unlock packet");
- return -1;
+ return ret_val;
}
#endif /* FEATURE_R33D */
/* This Descriptor is valid, so linked Control block is also valid
diff --git a/CORE/HDD/src/wlan_hdd_cfg80211.c b/CORE/HDD/src/wlan_hdd_cfg80211.c
index a2619e1..77ba092 100644
--- a/CORE/HDD/src/wlan_hdd_cfg80211.c
+++ b/CORE/HDD/src/wlan_hdd_cfg80211.c
@@ -4781,7 +4781,7 @@
{
hddLog(VOS_TRACE_LEVEL_ERROR,
"%s: No connection when AMP is on", __func__);
- return -1;
+ return -ECONNREFUSED;
}
#endif
/*initialise security parameters*/
diff --git a/CORE/HDD/src/wlan_hdd_dev_pwr.c b/CORE/HDD/src/wlan_hdd_dev_pwr.c
index a22412d..6eba425 100644
--- a/CORE/HDD/src/wlan_hdd_dev_pwr.c
+++ b/CORE/HDD/src/wlan_hdd_dev_pwr.c
@@ -112,7 +112,7 @@
{
/* Fail this suspend */
VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR, "%s: Fail wlan suspend: not in IMPS/BMPS", __func__);
- return -1;
+ return -EPERM;
}
/*
@@ -135,7 +135,7 @@
VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_FATAL, "%s: Not able to suspend TX thread timeout happened", __func__);
clear_bit(TX_SUSPEND_EVENT_MASK, &vosSchedContext->txEventFlag);
- return -1;
+ return -ETIME;
}
/* Set the Tx Thread as Suspended */
pHddCtx->isTxThreadSuspended = TRUE;
@@ -162,7 +162,7 @@
/* Set the Tx Thread as Resumed */
pHddCtx->isTxThreadSuspended = FALSE;
- return -1;
+ return -ETIME;
}
/* Set the Rx Thread as Suspended */
@@ -196,7 +196,7 @@
/* Set the Tx Thread as Resumed */
pHddCtx->isTxThreadSuspended = FALSE;
- return -1;
+ return -ETIME;
}
/* Set the Mc Thread as Suspended */
diff --git a/CORE/HDD/src/wlan_hdd_early_suspend.c b/CORE/HDD/src/wlan_hdd_early_suspend.c
index 6d96a86..191fd18 100644
--- a/CORE/HDD/src/wlan_hdd_early_suspend.c
+++ b/CORE/HDD/src/wlan_hdd_early_suspend.c
@@ -1824,7 +1824,7 @@
vos_mem_exit();
#endif
- return -1;
+ return -EPERM;
success:
//Trigger replay of BTC events
@@ -2326,7 +2326,7 @@
err_re_init:
/* Allow the phone to go to sleep */
hdd_allow_suspend();
- return -1;
+ return -EPERM;
success:
/* Trigger replay of BTC events */
diff --git a/CORE/HDD/src/wlan_hdd_ftm.c b/CORE/HDD/src/wlan_hdd_ftm.c
index aa7a1bf..666a74d 100644
--- a/CORE/HDD/src/wlan_hdd_ftm.c
+++ b/CORE/HDD/src/wlan_hdd_ftm.c
@@ -1656,7 +1656,7 @@
{
VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_FATAL,
"Not valid driver context");
- return -1;
+ return -EINVAL;
}
/* Test first chunk of NV table */
@@ -1668,7 +1668,7 @@
{
VOS_TRACE( VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_FATAL,
"Fail to get cached NV value Status %d", nvStatus);
- return -1;
+ return -EIO;
}
switch (nvTable->nvTable)
@@ -1726,7 +1726,7 @@
default:
VOS_TRACE( VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR,
"Not Valid NV Table %d", nvTable->nvTable);
- return -1;
+ return -EIO;
break;
}
@@ -1739,7 +1739,7 @@
pHddCtx->ftm.targetNVTableSize = 0;
pHddCtx->ftm.processedNVTableSize = 0;
vos_mem_zero(pHddCtx->ftm.tempNVTableBuffer, MAX_NV_TABLE_SIZE);
- return -1;
+ return -EINVAL;
}
/* Set Current Processing NV table type */
@@ -1762,7 +1762,7 @@
pHddCtx->ftm.processedNVTableSize = 0;
vos_mem_zero(pHddCtx->ftm.tempNVTableBuffer, MAX_NV_TABLE_SIZE);
- return -1;
+ return -EINVAL;
}
/* Copy next chunk of NV table value into response buffer */
@@ -1811,7 +1811,7 @@
{
VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_FATAL,
"Not valid driver context");
- return -1;
+ return -EINVAL;
}
/* Test first chunk of NV table */
@@ -1823,7 +1823,7 @@
{
VOS_TRACE( VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_FATAL,
"Fail to get cached NV value Status %d", nvStatus);
- return -1;
+ return -EINVAL;
}
switch (nvTable->nvTable)
@@ -1881,7 +1881,7 @@
default:
VOS_TRACE( VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR,
"Not Valid NV Table %d", nvTable->nvTable);
- return -1;
+ return -EIO;
break;
}
@@ -1895,7 +1895,7 @@
pHddCtx->ftm.targetNVTableSize = 0;
pHddCtx->ftm.processedNVTableSize = 0;
vos_mem_zero(pHddCtx->ftm.tempNVTableBuffer, MAX_NV_TABLE_SIZE);
- return -1;
+ return -EINVAL;
}
}
@@ -1908,7 +1908,7 @@
pHddCtx->ftm.targetNVTableSize = 0;
pHddCtx->ftm.processedNVTableSize = 0;
vos_mem_zero(pHddCtx->ftm.tempNVTableBuffer, MAX_NV_TABLE_SIZE);
- return -1;
+ return -EINVAL;
}
vos_mem_copy(pHddCtx->ftm.tempNVTableBuffer + pHddCtx->ftm.processedNVTableSize,
&nvTable->tableData,
@@ -1956,7 +1956,7 @@
{
VOS_TRACE( VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_INFO,
"Fail to get cached NV value Status %d", nvStatus);
- return -1;
+ return -EIO;
}
itemSize = sizeof(nvContents->tables.pwrOptimum);
@@ -2040,7 +2040,7 @@
{
VOS_TRACE( VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_INFO,
"Fail to get cached NV value Status %d", nvStatus);
- return -1;
+ return -EIO;
}
switch (nvTable->nvTable)
@@ -2118,7 +2118,7 @@
default:
VOS_TRACE( VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR,
"Not Valid NV Table %d", nvTable->nvTable);
- return -1;
+ return -EIO;
break;
}
@@ -2153,7 +2153,7 @@
{
VOS_TRACE( VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_INFO,
"Fail to get cached NV value Status %d", nvStatus);
- return -1;
+ return -EIO;
}
memcpy(&nvFieldDataBuffer, &nvContents->fields, sizeof(sNvFields));
@@ -2204,7 +2204,7 @@
default:
VOS_TRACE( VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR,
"Not Valid NV field %d", nvField->nvField);
- return -1;
+ return -EIO;
break;
}
@@ -2241,7 +2241,7 @@
{
VOS_TRACE( VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_INFO,
"Fail to get cached NV value Status %d", nvStatus);
- return -1;
+ return -EIO;
}
switch (nvField->nvField)
@@ -2279,7 +2279,7 @@
VOS_TRACE( VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR,
"Last Byte of the seed MAC is too large 0x%x",
nvField->fieldData.macAddr[VOS_MAC_ADDRESS_LEN - 1]);
- return -1;
+ return -EILSEQ;
}
pNVMac = (v_U8_t *)nvContents->fields.macAddr;
@@ -2309,7 +2309,7 @@
default:
VOS_TRACE( VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR,
"Not Valid NV field %d", nvField->nvField);
- return -1;
+ return -EIO;
break;
}
@@ -2344,7 +2344,7 @@
nvStatus = vos_nv_getNVBuffer((void **)&nvContents, &nvSize);
if((VOS_STATUS_SUCCESS != nvStatus) || (NULL == nvContents))
{
- return -1;
+ return -EIO;
}
/* Set Platform type as PRIMA */
@@ -2421,7 +2421,7 @@
default:
VOS_TRACE( VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR,
"Not Supported Table Type %d", nvTable->nvTable);
- return -1;
+ return -EIO;
break;
}
@@ -2431,7 +2431,7 @@
tableSize);
if(VOS_STATUS_SUCCESS != nvStatus)
{
- return -1;
+ return -EIO;
}
return 1;
@@ -2475,7 +2475,7 @@
\param - ftmCmd - Pointer FTM Commad Buffer
\return - int
- -1, Process Host command fail, vail out
+ < 0, Process Host command fail, bail out
0, Process Host command success, not need to send CMD to HAL
1, Process Host command success, need to send CMD to HAL
@@ -2565,11 +2565,11 @@
break;
}
- if(-1 == hostState)
+ if( 0 > hostState)
{
VOS_TRACE( VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR,
"Host Command Handle Fail, Bailout");
- return -1;
+ return hostState;
}
return needToRouteHal;
@@ -2726,7 +2726,7 @@
vos_mem_free(tempRspBuffer);
return;
}
- else if (-1 == hostState)
+ else if (0 > hostState)
{
hddLog(VOS_TRACE_LEVEL_ERROR, "*** Host Command Handle Fail ***");
pHddCtx->ftm.pResponseBuf->ftm_err_code = WLAN_FTM_FAILURE;
diff --git a/CORE/HDD/src/wlan_hdd_hostapd.c b/CORE/HDD/src/wlan_hdd_hostapd.c
index 58a1855..a693990 100644
--- a/CORE/HDD/src/wlan_hdd_hostapd.c
+++ b/CORE/HDD/src/wlan_hdd_hostapd.c
@@ -1393,7 +1393,7 @@
pHostapdState->bCommit = TRUE;
if(pHostapdState->vosStatus)
{
- return -1;
+ return -EIO;
}
else
{
@@ -1519,7 +1519,7 @@
if(eHAL_STATUS_SUCCESS != sme_getSoftApDomain(hHal,(v_REGDOMAIN_t *) &domainIdCurrentSoftap))
{
hddLog(LOG1,FL("Failed to get Domain ID, %d \n"),domainIdCurrentSoftap);
- return -1;
+ return -EIO;
}
if(REGDOMAIN_FCC == domainIdCurrentSoftap)
diff --git a/CORE/HDD/src/wlan_hdd_main.c b/CORE/HDD/src/wlan_hdd_main.c
index 4fc75bb..5ea6d0f 100644
--- a/CORE/HDD/src/wlan_hdd_main.c
+++ b/CORE/HDD/src/wlan_hdd_main.c
@@ -541,7 +541,7 @@
if(pAdapter == NULL) {
VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_FATAL,
"%s: HDD adapter context is Null", __func__);
- return -1;
+ return -EINVAL;
}
netif_start_queue(dev);
@@ -3334,7 +3334,7 @@
\param - dev - Pointer to the underlying device
- \return - 0 for success -1 for failure
+ \return - 0 for success, < 0 for failure
--------------------------------------------------------------------------*/
@@ -3368,7 +3368,7 @@
if(wiphy == NULL)
{
hddLog(VOS_TRACE_LEVEL_ERROR,"%s: cfg80211 init failed", __func__);
- return -1;
+ return -EIO;
}
pHddCtx = wiphy_priv(wiphy);
@@ -3379,7 +3379,7 @@
if(pHddCtx == NULL)
{
hddLog(VOS_TRACE_LEVEL_ERROR,"%s: cfg80211 init failed", __func__);
- return -1;
+ return -ENOMEM;
}
#endif
@@ -3987,7 +3987,7 @@
}
hdd_set_ssr_required (VOS_FALSE);
- return -1;
+ return -EIO;
success:
EXIT();
@@ -4032,7 +4032,7 @@
{
hddLog(VOS_TRACE_LEVEL_FATAL, "%s: Libra WLAN not Powered Up. "
"exiting", __func__);
- return -1;
+ return -EIO;
}
#ifdef ANI_BUS_TYPE_SDIO
@@ -4075,7 +4075,7 @@
{
hddLog(VOS_TRACE_LEVEL_FATAL, "%s: Retry Libra WLAN not Powered Up. "
"exiting", __func__);
- return -1;
+ return -EIO;
}
do {
diff --git a/CORE/HDD/src/wlan_hdd_p2p.c b/CORE/HDD/src/wlan_hdd_p2p.c
index e5eecde..b304779 100644
--- a/CORE/HDD/src/wlan_hdd_p2p.c
+++ b/CORE/HDD/src/wlan_hdd_p2p.c
@@ -817,7 +817,7 @@
param = strnchr(command, strlen(command), ' ');
if (param == NULL)
- return -1;
+ return -EINVAL;
param++;
sscanf(param, "%d %d %d", &count, &start_time, &duration);
VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO,
@@ -890,7 +890,7 @@
param = strnchr(command, strlen(command), ' ');
if (param == NULL)
- return -1;
+ return -EINVAL;
param++;
sscanf(param, "%d %d %d", &legacy_ps, &opp_ps, &ctwindow);
VOS_TRACE (VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO,
diff --git a/CORE/SVC/src/ptt/wlan_ptt_sock_svc.c b/CORE/SVC/src/ptt/wlan_ptt_sock_svc.c
index 8588416..5dd25b2 100644
--- a/CORE/SVC/src/ptt/wlan_ptt_sock_svc.c
+++ b/CORE/SVC/src/ptt/wlan_ptt_sock_svc.c
@@ -90,14 +90,14 @@
if (radio < 0 || radio > ANI_MAX_RADIOS) {
PTT_TRACE(VOS_TRACE_LEVEL_ERROR, "%s: invalid radio id [%d]\n",
__func__, radio);
- return -1;
+ return -EINVAL;
}
payload_len = wmsg_length + 4; // 4 extra bytes for the radio idx
tot_msg_len = NLMSG_SPACE(payload_len);
if ((skb = dev_alloc_skb(tot_msg_len)) == NULL) {
PTT_TRACE(VOS_TRACE_LEVEL_ERROR, "%s: dev_alloc_skb() failed for msg size[%d]\n",
__func__, tot_msg_len);
- return -1;
+ return -ENOMEM;
}
nlh = NLMSG_PUT(skb, pid, nlmsg_seq++, src_mod, payload_len);
nlh->nlmsg_flags = NLM_F_REQUEST;
diff --git a/CORE/SYS/legacy/src/utils/src/parserApi.c b/CORE/SYS/legacy/src/utils/src/parserApi.c
index 3ef7eba..028b2e9 100644
--- a/CORE/SYS/legacy/src/utils/src/parserApi.c
+++ b/CORE/SYS/legacy/src/utils/src/parserApi.c
@@ -163,6 +163,7 @@
tANI_U8 EID)
{
int idx, ieLen, bytesLeft;
+ int ret_val = -1;
// Here's what's going on: 'rsnIe' looks like this:
@@ -199,14 +200,14 @@
bytesLeft <= (tANI_U16)( ieLen ) )
{
dot11fLog( pMac, LOG3, FL("No IE (%d) in FindIELocation.\n"), EID );
- return (-1);
+ return ret_val;
}
bytesLeft -= ieLen;
ieLen = pRsnIe->rsnIEdata[ idx + 1 ] + 2;
idx += ieLen;
}
- return (-1);
+ return ret_val;
}
diff --git a/CORE/WDI/DP/src/wlan_qct_wdi_bd.c b/CORE/WDI/DP/src/wlan_qct_wdi_bd.c
index 13ff1dc..e53cfdb 100644
--- a/CORE/WDI/DP/src/wlan_qct_wdi_bd.c
+++ b/CORE/WDI/DP/src/wlan_qct_wdi_bd.c
@@ -193,6 +193,7 @@
WPT_STATIC WPT_INLINE int find_leading_zero_and_setbit(wpt_uint32 *bitmap, wpt_uint32 maxNumPool)
{
wpt_uint32 i,j, word;
+ int ret_val = -1;
for(i=0; i < (maxNumPool/32 + 1); i++){
j = 0;
@@ -205,7 +206,7 @@
word >>= 1;
}
}
- return -1;
+ return ret_val;
}
void *WDI_DS_MemPoolAlloc(WDI_DS_BdMemPoolType *memPool, void **pPhysAddress,
@@ -232,7 +233,7 @@
}
//Find the leading 0 in the allocation bitmap
- if((index = find_leading_zero_and_setbit(memPool->AllocationBitmap, maxNumPool)) == -1)
+ if((index = find_leading_zero_and_setbit(memPool->AllocationBitmap, maxNumPool)) == -EPERM)
{
//DbgBreakPoint();
DTI_TRACE( DTI_TRACE_LEVEL_INFO, "WDI_DS_MemPoolAlloc: index:%d(NULL), numChunks:%d",