wlan: Replace __FUNCTION__ argument with __func__ in the wlan driver
The fix is to not use the gcc specific __FUNCTION__ to capture function
name; but use __func__ which is a C-99 standard identifier
Change-Id: Ie36f1bb87a3a4a51ec177ab5b6a253e279401e88
CR-Fixed: NA
diff --git a/CORE/HDD/src/wlan_hdd_main.c b/CORE/HDD/src/wlan_hdd_main.c
index a4ba6a7..107dfc3 100644
--- a/CORE/HDD/src/wlan_hdd_main.c
+++ b/CORE/HDD/src/wlan_hdd_main.c
@@ -239,16 +239,16 @@
{
VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
"%s: Timeout occured while waiting for abortscan" ,
- __FUNCTION__);
+ __func__);
}
}
else
{
VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO,
- "%s: Scan is not Pending from user" , __FUNCTION__);
+ "%s: Scan is not Pending from user" , __func__);
}
#ifdef WLAN_BTAMP_FEATURE
- VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO,"%s: disabling AMP", __FUNCTION__);
+ VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO,"%s: disabling AMP", __func__);
status = WLANBAP_StopAmp();
if(VOS_STATUS_SUCCESS != status )
{
@@ -356,7 +356,7 @@
if (NULL == pAdapter)
{
VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_FATAL,
- "%s: HDD adapter context is Null", __FUNCTION__);
+ "%s: HDD adapter context is Null", __func__);
ret = -ENODEV;
goto exit;
}
@@ -377,7 +377,7 @@
if (!command)
{
VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_FATAL,
- "%s: failed to allocate memory\n", __FUNCTION__);
+ "%s: failed to allocate memory\n", __func__);
ret = -ENOMEM;
goto exit;
}
@@ -401,7 +401,7 @@
sizeof(tSirMacAddr)))
{
VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_FATAL,
- "%s: failed to copy data to user buffer\n", __FUNCTION__);
+ "%s: failed to copy data to user buffer\n", __func__);
ret = -EFAULT;
}
}
@@ -415,7 +415,7 @@
/* First 8 bytes will have "SETBAND " and
* 9 byte will have band setting value */
VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO,
- "%s: SetBandCommand Info comm %s UL %d, TL %d", __FUNCTION__, priv_data.buf, priv_data.used_len, priv_data.total_len);
+ "%s: SetBandCommand Info comm %s UL %d, TL %d", __func__, priv_data.buf, priv_data.used_len, priv_data.total_len);
/* Change band request received */
ret = hdd_setBand_helper(dev, ptr);
@@ -443,7 +443,7 @@
tANI_U8 *ptr = (tANI_U8*)priv_data.buf;
VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO,
- " Received Command to Set Preferred Channels for SAP in %s", __FUNCTION__);
+ " Received Command to Set Preferred Channels for SAP in %s", __func__);
ret = sapSetPreferredChannel(dev, ptr);
}
@@ -483,7 +483,7 @@
if (NULL == pAdapter)
{
VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_FATAL,
- "%s: HDD adapter context is Null", __FUNCTION__);
+ "%s: HDD adapter context is Null", __func__);
return -ENODEV;
}
@@ -491,7 +491,7 @@
if (NULL == pHddCtx)
{
VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_FATAL,
- "%s: HDD context is Null", __FUNCTION__);
+ "%s: HDD context is Null", __func__);
return -ENODEV;
}
@@ -526,7 +526,7 @@
if (hdd_connIsConnected(WLAN_HDD_GET_STATION_CTX_PTR(pAdapter)))
{
VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO,
- "%s: Enabling Tx Queues", __FUNCTION__);
+ "%s: Enabling Tx Queues", __func__);
/* Enable TX queues only when we are connected */
netif_tx_start_all_queues(dev);
}
@@ -540,7 +540,7 @@
if(pAdapter == NULL) {
VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_FATAL,
- "%s: HDD adapter context is Null", __FUNCTION__);
+ "%s: HDD adapter context is Null", __func__);
return -1;
}
@@ -573,7 +573,7 @@
if (NULL == pAdapter)
{
VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_FATAL,
- "%s: HDD adapter context is Null", __FUNCTION__);
+ "%s: HDD adapter context is Null", __func__);
return -ENODEV;
}
@@ -581,7 +581,7 @@
if (NULL == pHddCtx)
{
VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_FATAL,
- "%s: HDD context is Null", __FUNCTION__);
+ "%s: HDD context is Null", __func__);
return -ENODEV;
}
@@ -1965,12 +1965,12 @@
if (!VOS_IS_STATUS_SUCCESS(status))
{
hddLog(LOGE, "%s: failure waiting for WLANSAP_StopBss",
- __FUNCTION__);
+ __func__);
}
}
else
{
- hddLog(LOGE, "%s: failure in WLANSAP_StopBss", __FUNCTION__);
+ hddLog(LOGE, "%s: failure in WLANSAP_StopBss", __func__);
}
clear_bit(SOFTAP_BSS_STARTED, &pAdapter->event_flags);
@@ -1980,7 +1980,7 @@
{
hddLog(LOGE,
"%s: Failed to set WNI_CFG_PROBE_RSP_BCN_ADDNIE_FLAG",
- __FUNCTION__);
+ __func__);
}
if ( eHAL_STATUS_FAILURE == ccmCfgSetInt((WLAN_HDD_GET_CTX(pAdapter))->hHal,
@@ -2475,25 +2475,25 @@
if (NULL == pHddCtx)
{
hddLog(VOS_TRACE_LEVEL_ERROR,
- "%s: HDD context is Null", __FUNCTION__);
+ "%s: HDD context is Null", __func__);
return;
}
if (dev->flags & IFF_ALLMULTI)
{
hddLog(VOS_TRACE_LEVEL_INFO,
- "%s: allow all multicast frames", __FUNCTION__);
+ "%s: allow all multicast frames", __func__);
pHddCtx->mc_addr_list.mc_cnt = 0;
}
else
{
mc_count = netdev_mc_count(dev);
hddLog(VOS_TRACE_LEVEL_INFO,
- "%s: mc_count = %u", __FUNCTION__, mc_count);
+ "%s: mc_count = %u", __func__, mc_count);
if (mc_count > WLAN_HDD_MAX_MC_ADDR_LIST)
{
hddLog(VOS_TRACE_LEVEL_INFO,
- "%s: No free filter available; allow all multicast frames", __FUNCTION__);
+ "%s: No free filter available; allow all multicast frames", __func__);
pHddCtx->mc_addr_list.mc_cnt = 0;
return;
}
@@ -2630,7 +2630,7 @@
{
hddLog(VOS_TRACE_LEVEL_ERROR,
"%s: Bad param, context [%p]",
- __FUNCTION__, callbackContext);
+ __func__, callbackContext);
return;
}
@@ -2644,7 +2644,7 @@
/* the caller presumably timed out so there is nothing we can do */
hddLog(VOS_TRACE_LEVEL_WARN,
"%s: Invalid context, magic [%08x]",
- __FUNCTION__, pContext->magic);
+ __func__, pContext->magic);
return;
}
@@ -2806,7 +2806,7 @@
if (lrc <= 0)
{
hddLog(VOS_TRACE_LEVEL_ERROR, "%s: %s while requesting full power",
- __FUNCTION__, (0 == lrc) ? "timeout" : "interrupt");
+ __func__, (0 == lrc) ? "timeout" : "interrupt");
/* there is a race condition such that the callback
function could be executing at the same time we are. of
primary concern is if the callback function had already
@@ -2821,7 +2821,7 @@
{
hddLog(VOS_TRACE_LEVEL_ERROR,
"%s: Request for Full Power failed, status %d",
- __FUNCTION__, halStatus);
+ __func__, halStatus);
VOS_ASSERT(0);
/* continue -- need to clean up as much as possible */
}
@@ -3237,7 +3237,7 @@
{
hddLog(VOS_TRACE_LEVEL_FATAL,
"%s: unable to retrieve WCNSS WLAN compiled version",
- __FUNCTION__);
+ __func__);
break;
}
@@ -3247,7 +3247,7 @@
{
hddLog(VOS_TRACE_LEVEL_FATAL,
"%s: unable to retrieve WCNSS WLAN reported version",
- __FUNCTION__);
+ __func__);
break;
}
@@ -3285,7 +3285,7 @@
{
hddLog(VOS_TRACE_LEVEL_FATAL,
"%s: unable to retrieve WCNSS software version string",
- __FUNCTION__);
+ __func__);
break;
}
@@ -3299,7 +3299,7 @@
{
hddLog(VOS_TRACE_LEVEL_FATAL,
"%s: unable to retrieve WCNSS hardware version string",
- __FUNCTION__);
+ __func__);
break;
}
@@ -3581,7 +3581,7 @@
status = hdd_wmm_init(pHddCtx);
if (!VOS_IS_STATUS_SUCCESS(status))
{
- hddLog(VOS_TRACE_LEVEL_FATAL, "%s: hdd_wmm_init failed", __FUNCTION__);
+ hddLog(VOS_TRACE_LEVEL_FATAL, "%s: hdd_wmm_init failed", __func__);
goto err_vosclose;
}
@@ -3724,7 +3724,7 @@
{
hddLog(VOS_TRACE_LEVEL_FATAL,
"%s: Failed to allocate mac_address for p2p_device",
- __FUNCTION__);
+ __func__);
goto err_close_adapter;
}
@@ -3734,7 +3734,7 @@
{
hddLog(VOS_TRACE_LEVEL_FATAL,
"%s: Failed to do hdd_open_adapter for P2P Device Interface",
- __FUNCTION__);
+ __func__);
goto err_close_adapter;
}
#endif
@@ -4535,7 +4535,7 @@
}
/* we are in an invalid state :( */
- hddLog(LOGE, "%s: Invalid context", __FUNCTION__);
+ hddLog(LOGE, "%s: Invalid context", __func__);
return VOS_STA;
}