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/BAP/src/btampFsm.c b/CORE/BAP/src/btampFsm.c
index dc8d5c7..f5e5841 100644
--- a/CORE/BAP/src/btampFsm.c
+++ b/CORE/BAP/src/btampFsm.c
@@ -183,12 +183,12 @@
     if (NULL == hHal) 
     {
         VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_ERROR,
-                     "hHal is NULL in %s", __FUNCTION__);
+                     "hHal is NULL in %s", __func__);
 
         return VOS_STATUS_E_FAULT;
     }
 
-    VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "%s: btampContext value: %x", __FUNCTION__,  btampContext); 
+    VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "%s: btampContext value: %x", __func__,  btampContext); 
 
     /* Fill in the event structure */ 
     bapEvent.event = eWLAN_BAP_RSN_SUCCESS;
@@ -446,7 +446,7 @@
     if (NULL == btampContext) 
     {
         VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_ERROR,
-                     "btampContext is NULL in %s", __FUNCTION__);
+                     "btampContext is NULL in %s", __func__);
 
         return VOS_STATUS_E_FAULT;
     }
@@ -455,7 +455,7 @@
     if (NULL == hHal) 
     {
         VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_ERROR,
-                     "hHal is NULL in %s", __FUNCTION__);
+                     "hHal is NULL in %s", __func__);
 
         return VOS_STATUS_E_FAULT;
     }
@@ -474,7 +474,7 @@
     {
         pProfile->SSIDs.numOfSSIDs = 2;
 
-        VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "%s: bssType = %s, SSID specified = %s\n", __FUNCTION__, "eCSR_BSS_TYPE_WDS_STA", convertBSSIDToSSID(btampContext->btamp_Remote_AMP_Assoc.HC_mac_addr));
+        VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "%s: bssType = %s, SSID specified = %s\n", __func__, "eCSR_BSS_TYPE_WDS_STA", convertBSSIDToSSID(btampContext->btamp_Remote_AMP_Assoc.HC_mac_addr));
     
         vos_mem_zero(pProfile->SSIDs.SSIDList[0].SSID.ssId, 
                 sizeof(pProfile->SSIDs.SSIDList[0].SSID.ssId));
@@ -501,7 +501,7 @@
     {
         pProfile->SSIDs.numOfSSIDs = 1;
 
-        VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "%s: bssType = %s, SSID specified = %s\n", __FUNCTION__, "eCSR_BSS_TYPE_WDS_AP", convertBSSIDToSSID(btampContext->self_mac_addr));
+        VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "%s: bssType = %s, SSID specified = %s\n", __func__, "eCSR_BSS_TYPE_WDS_AP", convertBSSIDToSSID(btampContext->self_mac_addr));
     
         vos_mem_zero(pProfile->SSIDs.SSIDList[0].SSID.ssId, 
                 sizeof(pProfile->SSIDs.SSIDList[0].SSID.ssId));
@@ -527,7 +527,7 @@
     {
         pProfile->SSIDs.numOfSSIDs = 1;
     
-        VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "%s: bssType = %s, SSID specified = %s\n", __FUNCTION__, "eCSR_BSS_TYPE_WDS_STA", convertBSSIDToSSID(btampContext->btamp_Remote_AMP_Assoc.HC_mac_addr));
+        VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "%s: bssType = %s, SSID specified = %s\n", __func__, "eCSR_BSS_TYPE_WDS_STA", convertBSSIDToSSID(btampContext->btamp_Remote_AMP_Assoc.HC_mac_addr));
 
         vos_mem_zero(pProfile->SSIDs.SSIDList[0].SSID.ssId, 
                 sizeof(pProfile->SSIDs.SSIDList[0].SSID.ssId));
@@ -766,7 +766,7 @@
     if (NULL == btampContext) 
     {
         VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_ERROR,
-                     "btampContext is NULL in %s", __FUNCTION__);
+                     "btampContext is NULL in %s", __func__);
 
         return VOS_STATUS_E_FAULT;
     }
@@ -775,7 +775,7 @@
     if (NULL == hHal) 
     {
         VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_ERROR,
-                     "hHal is NULL in %s", __FUNCTION__);
+                     "hHal is NULL in %s", __func__);
 
         return VOS_STATUS_E_FAULT;
     }
@@ -806,10 +806,10 @@
     //fail the HCI Create Physical Link 
 
     VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, 
-            "In %s, amp_assoc_remaining_length = %d", __FUNCTION__, 
+            "In %s, amp_assoc_remaining_length = %d", __func__, 
             pBapHCIWriteRemoteAMPAssoc->amp_assoc_remaining_length); 
 #if 0
-    DUMPLOG(1, __FUNCTION__, "amp_assoc_fragment",  
+    DUMPLOG(1, __func__, "amp_assoc_fragment",  
             pBapHCIWriteRemoteAMPAssoc->amp_assoc_fragment, 
             64);
 #endif //0
@@ -824,7 +824,7 @@
     /* Unknown or Reserved TLVs are allowed in the write AMP assoc fragment */
     if ((BTAMP_PARSE_SUCCESS != parseStatus ) && (BTAMP_UNKNOWN_TLVS != parseStatus))  
     {
-        VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, parseStatus = %d", __FUNCTION__, parseStatus);
+        VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, parseStatus = %d", __func__, parseStatus);
         *status = WLANBAP_ERROR_INVALID_HCI_CMND_PARAM;
         return VOS_STATUS_E_BADMSG;
     }
@@ -945,7 +945,7 @@
         else
         {
             VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_ERROR,
-                         "sme_OpenSession failed in %s", __FUNCTION__);
+                         "sme_OpenSession failed in %s", __func__);
             *status = WLANBAP_ERROR_NO_CNCT;
             return VOS_STATUS_E_FAILURE;
         }
@@ -962,7 +962,7 @@
     if(VOS_STATUS_E_INVAL == vosStatus)
     {
         VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_ERROR,
-                     "Incorrect channel to create AMP link %s", __FUNCTION__);
+                     "Incorrect channel to create AMP link %s", __func__);
         *status = WLANBAP_ERROR_NO_SUITABLE_CHANNEL;
         return VOS_STATUS_E_INVAL;
     }
@@ -1180,7 +1180,7 @@
     {
        VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_ERROR, 
                   "%s: WLANTL_RegisterSTAClient() failed to register.  Status= %d [0x%08lX]",
-                  __FUNCTION__, vosStatus, vosStatus );
+                  __func__, vosStatus, vosStatus );
     }                                            
      
     if ( !  btampContext->ucSecEnabled )
@@ -1408,7 +1408,7 @@
 #ifdef BAP_DEBUG
   /* Trace the tBtampCtx being passed in. */
   VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH,
-            "WLAN BAP Context Monitor: btampContext value = %x in %s:%d", btampContext, __FUNCTION__, __LINE__ );
+            "WLAN BAP Context Monitor: btampContext value = %x in %s:%d", btampContext, __func__, __LINE__ );
 #endif //BAP_DEBUG
 
     /* Loop disconnecting all Logical Links on this Physical Link */
@@ -1420,7 +1420,7 @@
         { 
             VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_ERROR, 
                     "WLAN BAP: Deleting logical link entry %d in %s", i,
-                    __FUNCTION__); 
+                    __func__); 
 
             /* Mark this Logical Link index value as free */
             pLogLinkContext->present = VOS_FALSE; 
@@ -1607,7 +1607,7 @@
             ieLen, 
             &dot11BeaconIEs);
 
-    //DUMPLOG(9,  __FUNCTION__, "dot11BeaconIEs", &dot11BeaconIEs, 64);
+    //DUMPLOG(9,  __func__, "dot11BeaconIEs", &dot11BeaconIEs, 64);
 
     pDot11SSID = &dot11BeaconIEs.SSID; 
 
@@ -1617,7 +1617,7 @@
         if (pDot11SSID->present )
         {
 
-        //DUMPLOG(10,  __FUNCTION__, "pDot11SSID present", pDot11SSID, 64);
+        //DUMPLOG(10,  __func__, "pDot11SSID present", pDot11SSID, 64);
 
         btampContext->assocSsidLen = pDot11SSID->num_ssid;  
         vos_mem_copy(btampContext->assocSsid, 
@@ -1644,7 +1644,7 @@
         if (pDot11RSN->present )
         {
 
-        //DUMPLOG(10,  __FUNCTION__, "pDot11RSN present", pDot11RSN, 64);
+        //DUMPLOG(10,  __func__, "pDot11RSN present", pDot11RSN, 64);
 
         //The 802.11 BT-AMP PAL only supports WPA2-PSK  
         if (!vos_mem_compare(pRSNOui02, //  RSN-PSK
@@ -1717,7 +1717,7 @@
     if (NULL == hHal) 
     {
         VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_ERROR,
-                     "hHal is NULL in %s", __FUNCTION__);
+                     "hHal is NULL in %s", __func__);
 
         return VOS_STATUS_E_FAULT;
     }
@@ -1736,7 +1736,7 @@
         if((msg==(BTAMPFSM_EVENT_T)eWLAN_BAP_HCI_PHYSICAL_LINK_CREATE))
         {
           /*Transition from DISCONNECTED to S1 (both without substates)*/
-          VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, from state %s => %s", __FUNCTION__, "DISCONNECTED", "S1");
+          VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, from state %s => %s", __func__, "DISCONNECTED", "S1");
  
 #if 0
          /* This will have issues in multisession. Need not close the session */
@@ -1752,14 +1752,14 @@
 
           /* Set BAP device role */
           vosStatus = gotoS1( btampContext, bapEvent, BT_INITIATOR, status); 
-          VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, cmd status is %d", __FUNCTION__, *status);
+          VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, cmd status is %d", __func__, *status);
            /*Advance outer statevar */
           btampfsmChangeToState(instanceVar,S1);
         }
         else if((msg==(BTAMPFSM_EVENT_T)eWLAN_BAP_HCI_PHYSICAL_LINK_ACCEPT))
         {
           /*Transition from DISCONNECTED to S1 (both without substates)*/
-          VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, from state %s => %s", __FUNCTION__, "DISCONNECTED", "S1");
+          VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, from state %s => %s", __func__, "DISCONNECTED", "S1");
           
 #if 0
           if(btampContext->isBapSessionOpen == TRUE)
@@ -1779,7 +1779,7 @@
         }
         else
         {
-          VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, in state %s, invalid event msg %d", __FUNCTION__, "DISCONNECTED", msg);
+          VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, in state %s, invalid event msg %d", __func__, "DISCONNECTED", msg);
           /* Intentionally left blank */
         }
       break;
@@ -1789,7 +1789,7 @@
            ) && (btampContext->BAPDeviceRole == BT_INITIATOR && !(CHANNEL_NOT_SELECTED)))
         {
           /*Transition from S1 to STARTING (both without substates)*/
-          VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, from state %s => %s", __FUNCTION__, "S1", "STARTING");
+          VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, from state %s => %s", __func__, "S1", "STARTING");
 
           /*Action code for transition */
           vosStatus = determineChan(btampContext, BT_INITIATOR, &channel, status);
@@ -1805,7 +1805,7 @@
         else if((msg==(BTAMPFSM_EVENT_T)eWLAN_BAP_TIMER_CONNECT_ACCEPT_TIMEOUT))
         {
           /*Transition from S1 to DISCONNECTED (both without substates)*/
-          VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, from state %s => %s", __FUNCTION__, "S1", "DISCONNECTED");
+          VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, from state %s => %s", __func__, "S1", "DISCONNECTED");
 
           /*Action code for transition */
           /* Set everything back as dis-connected */    
@@ -1818,7 +1818,7 @@
         else if((msg==(BTAMPFSM_EVENT_T)eWLAN_BAP_HCI_PHYSICAL_LINK_DISCONNECT))
         {
           /*Transition from S1 to DISCONNECTED (both without substates)*/
-          VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, from state %s => %s", __FUNCTION__, "S1", "DISCONNECTED");
+          VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, from state %s => %s", __func__, "S1", "DISCONNECTED");
 
           /*Action code for transition */
           gotoDisconnected(btampContext);
@@ -1836,7 +1836,7 @@
                 ) && (btampContext->BAPDeviceRole == BT_RESPONDER))
         {
           /*Transition from S1 to STARTING (both without substates)*/
-          VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, from state %s => %s", __FUNCTION__, "S1", "STARTING");
+          VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, from state %s => %s", __func__, "S1", "STARTING");
 
           /*Action code for transition */
           //determineChan(BT_RESPONDER);
@@ -1855,7 +1855,7 @@
                 ) && (btampContext->BAPDeviceRole == BT_INITIATOR && CHANNEL_NOT_SELECTED))
         {
           /*Transition from S1 to SCANNING (both without substates)*/
-          VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, from state %s => %s", __FUNCTION__, "S1", "SCANNING");
+          VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, from state %s => %s", __func__, "S1", "SCANNING");
 
           /*Action code for transition */
           gotoScanning(btampContext, BT_RESPONDER, status);
@@ -1864,7 +1864,7 @@
         }
         else
         {
-          VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, in state %s, invalid event msg %d", __FUNCTION__, "S1", msg);
+          VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, in state %s, invalid event msg %d", __func__, "S1", msg);
           /* Intentionally left blank */
         }
       break;
@@ -1874,7 +1874,7 @@
            ) && (btampContext->BAPDeviceRole == BT_INITIATOR))
         {
           /*Transition from STARTING to CONNECTING (both without substates)*/
-          VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, from state %s => %s", __FUNCTION__, "STARTING", "CONNECTING");
+          VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, from state %s => %s", __func__, "STARTING", "CONNECTING");
 
           btampfsmChangeToState(instanceVar,CONNECTING);//Moved to debug
 
@@ -1889,7 +1889,7 @@
         else if((msg==(BTAMPFSM_EVENT_T)eWLAN_BAP_HCI_PHYSICAL_LINK_DISCONNECT))
         {
           /*Transition from STARTING to DISCONNECTING (both without substates)*/
-          VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, from state %s => %s", __FUNCTION__, "STARTING", "DISCONNECTING");
+          VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, from state %s => %s", __func__, "STARTING", "DISCONNECTING");
 
           /*Action code for transition */
           //csrRoamDisconnect();
@@ -1919,7 +1919,7 @@
         else if((msg==(BTAMPFSM_EVENT_T)eWLAN_BAP_CHANNEL_SELECTION_FAILED))
         {
           /*Transition from STARTING to DISCONNECTED (both without substates)*/
-          VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, from state %s => %s", __FUNCTION__, "STARTING", "DISCONNECTED");
+          VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, from state %s => %s", __func__, "STARTING", "DISCONNECTED");
 
           gotoDisconnected(btampContext);
           /*Advance outer statevar */
@@ -1931,7 +1931,7 @@
                 ) && (btampContext->BAPDeviceRole == BT_RESPONDER))
         {
           /*Transition from STARTING to CONNECTING (both without substates)*/
-          VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, from state %s => %s", __FUNCTION__, "STARTING", "CONNECTING");
+          VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, from state %s => %s", __func__, "STARTING", "CONNECTING");
 
           /* Set the selected channel */
           /*should have been already set */
@@ -1946,7 +1946,7 @@
         else if((msg==(BTAMPFSM_EVENT_T)eWLAN_BAP_TIMER_CONNECT_ACCEPT_TIMEOUT))
         {
           /*Transition from STARTING to DISCONNECTING (both without substates)*/
-          VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, from state %s => %s", __FUNCTION__, "STARTING", "DISCONNECTING");
+          VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, from state %s => %s", __func__, "STARTING", "DISCONNECTING");
 
           /*Action code for transition */
           //csrRoamDisconnect();
@@ -1966,7 +1966,7 @@
         else if((msg==(BTAMPFSM_EVENT_T)eWLAN_BAP_MAC_START_FAILS))
         {
           /*Transition from STARTING to DISCONNECTED (both without substates)*/
-          VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, from state %s => %s", __FUNCTION__, "STARTING", "DISCONNECTED");
+          VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, from state %s => %s", __func__, "STARTING", "DISCONNECTED");
 
           /*Action code for transition */
           gotoDisconnected(btampContext);
@@ -1976,7 +1976,7 @@
         }
         else
         {
-          VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, in state %s, invalid event msg %d", __FUNCTION__, "STARTING", msg);
+          VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, in state %s, invalid event msg %d", __func__, "STARTING", msg);
           /* Intentionally left blank */
         }
       break;
@@ -1986,8 +1986,8 @@
            ) && (btampContext->BAPDeviceRole == BT_RESPONDER))
         {
           /*Transition from CONNECTING to AUTHENTICATING (both without substates)*/
-          VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, from state %s => %s", __FUNCTION__, "CONNECTING", "AUTHENTICATING");
-          //VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, from state %s => %s", __FUNCTION__, "CONNECTING", "CONNECTED");
+          VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, from state %s => %s", __func__, "CONNECTING", "AUTHENTICATING");
+          //VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, from state %s => %s", __func__, "CONNECTING", "CONNECTED");
 
             gotoAuthenticating(btampContext);
           /*Action code for transition */
@@ -2012,7 +2012,7 @@
         else if((msg==(BTAMPFSM_EVENT_T)eWLAN_BAP_HCI_PHYSICAL_LINK_DISCONNECT))
         {
           /*Transition from CONNECTING to DISCONNECTING (both without substates)*/
-          VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, from state %s => %s", __FUNCTION__, "CONNECTING", "DISCONNECTING");
+          VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, from state %s => %s", __func__, "CONNECTING", "DISCONNECTING");
 
           /*Action code for transition */
           //csrRoamDisconnect();
@@ -2041,7 +2041,7 @@
                 ) && !validAssocInd(btampContext, (tCsrRoamInfo *)bapEvent->params))
         {
           /*Transition from CONNECTING to DISCONNECTING (both without substates)*/
-          VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, from state %s => %s", __FUNCTION__, "CONNECTING", "DISCONNECTING");
+          VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, from state %s => %s", __func__, "CONNECTING", "DISCONNECTING");
           /*Action code for transition */
           //csrRoamDisconnect(DEAUTH);
           //JEZ081120: Danlin points out that I could just ignore this
@@ -2068,9 +2068,9 @@
                 ) && validAssocInd(btampContext, (tCsrRoamInfo *)bapEvent->params))
         {
           /*Transition from CONNECTING to VALIDATED (both without substates)*/
-          //VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, from state %s => %s", __FUNCTION__, "CONNECTING", "VALIDATED");
-          VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, from state %s => %s", __FUNCTION__, "CONNECTING", "AUTHENTICATING");
-          //VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, from state %s => %s", __FUNCTION__, "CONNECTING", "CONNECTED");
+          //VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, from state %s => %s", __func__, "CONNECTING", "VALIDATED");
+          VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, from state %s => %s", __func__, "CONNECTING", "AUTHENTICATING");
+          //VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, from state %s => %s", __func__, "CONNECTING", "CONNECTED");
 
           /*Action code for transition */
           // JEZ081027: This one is a pain.  Since we are responding in the
@@ -2112,7 +2112,7 @@
         else if((msg==(BTAMPFSM_EVENT_T)eWLAN_BAP_MAC_CONNECT_FAILED))
         {
           /*Transition from CONNECTING to DISCONNECTING (both without substates)*/
-          VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, from state %s => %s", __FUNCTION__, "CONNECTING", "DISCONNECTING");
+          VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, from state %s => %s", __func__, "CONNECTING", "DISCONNECTING");
 
           /*Action code for transition */
             sme_RoamDisconnect(hHal,
@@ -2134,7 +2134,7 @@
         else if((msg==(BTAMPFSM_EVENT_T)eWLAN_BAP_TIMER_CONNECT_ACCEPT_TIMEOUT))
         {
           /*Transition from CONNECTING to DISCONNECTING (both without substates)*/
-          VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, from state %s => %s", __FUNCTION__, "CONNECTING", "DISCONNECTING");
+          VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, from state %s => %s", __func__, "CONNECTING", "DISCONNECTING");
 
           /*Action code for transition */
           //csrRoamDisconnect();
@@ -2153,7 +2153,7 @@
         }
         else
         {
-          VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, in state %s, invalid event msg %d", __FUNCTION__, "CONNECTING", msg);
+          VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, in state %s, invalid event msg %d", __func__, "CONNECTING", msg);
           /* Intentionally left blank */
         }
       break;
@@ -2163,7 +2163,7 @@
            ) && (btampContext->BAPDeviceRole == BT_RESPONDER))
         {
           /*Transition from AUTHENTICATING to KEYING (both without substates)*/
-          VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, from state %s => %s", __FUNCTION__, "AUTHENTICATING", "KEYING");
+          VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, from state %s => %s", __func__, "AUTHENTICATING", "KEYING");
 
           /*Action code for transition */
           //sme_RoamSetContext(); 
@@ -2185,7 +2185,7 @@
                 ) && (btampContext->BAPDeviceRole == BT_INITIATOR))
         {
           /*Transition from AUTHENTICATING to KEYING (both without substates)*/
-          VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, from state %s => %s", __FUNCTION__, "AUTHENTICATING", "KEYING");
+          VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, from state %s => %s", __func__, "AUTHENTICATING", "KEYING");
 
           /*Action code for transition */
           //sme_RoamSetContext(); 
@@ -2206,7 +2206,7 @@
         else if((msg==(BTAMPFSM_EVENT_T)eWLAN_BAP_TIMER_CONNECT_ACCEPT_TIMEOUT))
         {
           /*Transition from AUTHENTICATING to DISCONNECTING (both without substates)*/
-          VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, from state %s => %s ConnectAcceptTimeout", __FUNCTION__, "AUTHENTICATING", "DISCONNECTING");
+          VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, from state %s => %s ConnectAcceptTimeout", __func__, "AUTHENTICATING", "DISCONNECTING");
 
           gotoDisconnecting(
                   btampContext,
@@ -2226,7 +2226,7 @@
         else if((msg==(BTAMPFSM_EVENT_T)eWLAN_BAP_HCI_PHYSICAL_LINK_DISCONNECT))
         {
           /*Transition from AUTHENTICATING to DISCONNECTING (both without substates)*/
-          VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, from state %s => %s Physicallink Disconnect", __FUNCTION__, "AUTHENTICATING", "DISCONNECTING");
+          VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, from state %s => %s Physicallink Disconnect", __func__, "AUTHENTICATING", "DISCONNECTING");
 
           /*Action code for transition */
           //csrRoamDisconnect();
@@ -2253,7 +2253,7 @@
         else if((msg==(BTAMPFSM_EVENT_T)eWLAN_BAP_RSN_FAILURE))
         {
           /*Transition from AUTHENTICATING to DISCONNECTING (both without substates)*/
-          VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, from state %s => %s RSN Failure", __FUNCTION__, "AUTHENTICATING", "DISCONNECTING");
+          VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, from state %s => %s RSN Failure", __func__, "AUTHENTICATING", "DISCONNECTING");
 
           /*Action code for transition */
           //csrRoamDisconnect(DEAUTH);
@@ -2273,7 +2273,7 @@
         }
         else
         {
-          VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, in state %s, invalid event msg %d", __FUNCTION__, "AUTHENTICATING", msg);
+          VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, in state %s, invalid event msg %d", __func__, "AUTHENTICATING", msg);
           /* Intentionally left blank */
         }
       break;
@@ -2282,7 +2282,7 @@
         if((msg==(BTAMPFSM_EVENT_T)eWLAN_BAP_HCI_PHYSICAL_LINK_DISCONNECT))
         {
           /*Transition from CONNECTED to DISCONNECTING (both without substates)*/
-          VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, from state %s => %s", __FUNCTION__, "CONNECTED", "DISCONNECTING");
+          VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, from state %s => %s", __func__, "CONNECTED", "DISCONNECTING");
 
             gotoDisconnecting(
                   btampContext,
@@ -2305,7 +2305,7 @@
         {
 
           /*Transition from CONNECTED to DISCONNECTING (both without substates)*/
-          VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, from state %s => %s", __FUNCTION__, "CONNECTED", "DISCONNECTING");
+          VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, from state %s => %s", __func__, "CONNECTED", "DISCONNECTING");
           WLANBAP_DeInitLinkSupervision(( ptBtampHandle)btampContext);
 
           gotoDisconnecting(
@@ -2323,7 +2323,7 @@
         }
         else
         {
-          VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, in state %s, invalid event msg %d", __FUNCTION__, "CONNECTED", msg);
+          VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, in state %s, invalid event msg %d", __func__, "CONNECTED", msg);
           /* Intentionally left blank */
         }
       break;
@@ -2336,12 +2336,12 @@
  * Naw! Not necessary.
  */
       case DISCONNECTING:
-         VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, Entered DISCONNECTING:", __FUNCTION__);//Debug statement
+         VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, Entered DISCONNECTING:", __func__);//Debug statement
         if((msg==(BTAMPFSM_EVENT_T)eWLAN_BAP_MAC_READY_FOR_CONNECTIONS
            ) && (btampContext->gDiscRequested == VOS_TRUE))
         {
           /*Transition from DISCONNECTING to DISCONNECTED (both without substates)*/
-          VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, from state %s => %s", __FUNCTION__, "DISCONNECTING", "DISCONNECTED");
+          VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, from state %s => %s", __func__, "DISCONNECTING", "DISCONNECTED");
 
     //Clear gDiscRequested;
     btampContext->gDiscRequested = VOS_FALSE;
@@ -2372,14 +2372,14 @@
           if ( VOS_STATUS_SUCCESS != vosStatus ) 
           {
               VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO,
-                          "Unable to retrieve STA Id from BAP context and phy_link_handle in %s", __FUNCTION__);
+                          "Unable to retrieve STA Id from BAP context and phy_link_handle in %s", __func__);
               return VOS_STATUS_E_FAULT;
           }
           WLANTL_ClearSTAClient(btampContext->pvosGCtx, ucSTAId);
 
     //      gotoDisconnected(btampContext);
 
-      //    VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "%s:In DISCONNECTING-changing outer state var to DISCONNECTED", __FUNCTION__);
+      //    VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "%s:In DISCONNECTING-changing outer state var to DISCONNECTED", __func__);
           /*Advance outer statevar */
         //  btampfsmChangeToState(instanceVar,DISCONNECTED);
 
@@ -2392,7 +2392,7 @@
           /*Action code for transition */
           gotoDisconnected(btampContext);
 
-          VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "%s:In DISCONNECTING-changing outer state var to DISCONNECTED", __FUNCTION__);
+          VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "%s:In DISCONNECTING-changing outer state var to DISCONNECTED", __func__);
           /*Advance outer statevar */
           btampfsmChangeToState(instanceVar,DISCONNECTED);
         }
@@ -2400,7 +2400,7 @@
                 ) && (btampContext->gNeedPhysLinkCompEvent == VOS_TRUE))
         {
           /*Transition from DISCONNECTING to DISCONNECTED (both without substates)*/
-          VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, from state %s => %s gNeedPhysLinkComp TRUE", __FUNCTION__, "DISCONNECTING", "DISCONNECTED");
+          VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, from state %s => %s gNeedPhysLinkComp TRUE", __func__, "DISCONNECTING", "DISCONNECTED");
           if(btampContext->BAPDeviceRole == BT_INITIATOR) 
           {
               if(!VOS_IS_STATUS_SUCCESS(vos_lock_acquire(&btampContext->bapLock)))
@@ -2427,7 +2427,7 @@
           if ( VOS_STATUS_SUCCESS != vosStatus ) 
           {
               VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO,
-                          "Unable to retrieve STA Id from BAP context and phy_link_handle in %s", __FUNCTION__);
+                          "Unable to retrieve STA Id from BAP context and phy_link_handle in %s", __func__);
               return VOS_STATUS_E_FAULT;
           }
           WLANTL_ClearSTAClient(btampContext->pvosGCtx, ucSTAId);
@@ -2445,7 +2445,7 @@
         }
         else
         {
-          VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, in state %s, invalid event msg %d", __FUNCTION__, "DISCONNECTING", msg);
+          VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, in state %s, invalid event msg %d", __func__, "DISCONNECTING", msg);
           /* Intentionally left blank */
         }
       break;
@@ -2454,7 +2454,7 @@
         if((msg==(BTAMPFSM_EVENT_T)eWLAN_BAP_TIMER_CONNECT_ACCEPT_TIMEOUT))
         {
           /*Transition from KEYING to DISCONNECTING (both without substates)*/
-          VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, from state %s => %s", __FUNCTION__, "KEYING", "DISCONNECTING");
+          VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, from state %s => %s", __func__, "KEYING", "DISCONNECTING");
 
           /*Action code for transition */
           //csrRoamDisconnect();
@@ -2474,7 +2474,7 @@
         else if((msg==(BTAMPFSM_EVENT_T)eWLAN_BAP_HCI_PHYSICAL_LINK_DISCONNECT))
         {
           /*Transition from KEYING to DISCONNECTING (both without substates)*/
-          VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, from state %s => %s", __FUNCTION__, "KEYING", "DISCONNECTING");
+          VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, from state %s => %s", __func__, "KEYING", "DISCONNECTING");
 
           /*Action code for transition */
           //csrRoamDisconnect();
@@ -2503,7 +2503,7 @@
         else if((msg==(BTAMPFSM_EVENT_T)eWLAN_BAP_MAC_KEY_SET_SUCCESS))
         {
           /*Transition from KEYING to CONNECTED (both without substates)*/
-          VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, from state %s => %s", __FUNCTION__, "KEYING", "CONNECTED");
+          VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, from state %s => %s", __func__, "KEYING", "CONNECTED");
 
           /*Action code for transition */
           gotoConnected(btampContext);
@@ -2513,7 +2513,7 @@
         }
         else
         {
-          VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, in state %s, invalid event msg %d", __FUNCTION__, "KEYING", msg);
+          VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, in state %s, invalid event msg %d", __func__, "KEYING", msg);
           /* Intentionally left blank */
         }
       break;
@@ -2522,7 +2522,7 @@
         if((msg==(BTAMPFSM_EVENT_T)eWLAN_BAP_MAC_SCAN_COMPLETE))
         {
           /*Transition from SCANNING to STARTING (both without substates)*/
-          VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, from state %s => %s", __FUNCTION__, "SCANNING", "STARTING");
+          VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, from state %s => %s", __func__, "SCANNING", "STARTING");
 
           /*Action code for transition */
           vosStatus = determineChan(btampContext, BT_INITIATOR, &channel, status);
@@ -2538,7 +2538,7 @@
         else if((msg==(BTAMPFSM_EVENT_T)eWLAN_BAP_TIMER_CONNECT_ACCEPT_TIMEOUT))
         {
           /*Transition from SCANNING to DISCONNECTED (both without substates)*/
-          VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, from state %s => %s", __FUNCTION__, "SCANNING", "DISCONNECTED");
+          VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, from state %s => %s", __func__, "SCANNING", "DISCONNECTED");
 
           /*Action code for transition */
           gotoDisconnected(btampContext);
@@ -2550,7 +2550,7 @@
         else if((msg==(BTAMPFSM_EVENT_T)eWLAN_BAP_HCI_PHYSICAL_LINK_DISCONNECT))
         {
           /*Transition from SCANNING to DISCONNECTED (both without substates)*/
-          VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, from state %s => %s", __FUNCTION__, "SCANNING", "DISCONNECTED");
+          VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, from state %s => %s", __func__, "SCANNING", "DISCONNECTED");
 
           /*Action code for transition */
           gotoDisconnected(btampContext);
@@ -2564,7 +2564,7 @@
         }
         else
         {
-          VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, in state %s, invalid event msg %d", __FUNCTION__, "SCANNING", msg);
+          VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, in state %s, invalid event msg %d", __func__, "SCANNING", msg);
           /* Intentionally left blank */
         }
       break;
@@ -2574,7 +2574,7 @@
            ) && (btampContext->BAPDeviceRole == BT_INITIATOR))
         {
           /*Transition from VALIDATED to AUTHENTICATING (both without substates)*/
-          VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, from state %s => %s", __FUNCTION__, "VALIDATED", "AUTHENTICATING");
+          VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, from state %s => %s", __func__, "VALIDATED", "AUTHENTICATING");
 
             gotoAuthenticating(btampContext);
           /*Action code for transition */
@@ -2585,7 +2585,7 @@
         else if((msg==(BTAMPFSM_EVENT_T)eWLAN_BAP_TIMER_CONNECT_ACCEPT_TIMEOUT))
         {
           /*Transition from VALIDATED to DISCONNECTING (both without substates)*/
-          VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, from state %s => %s", __FUNCTION__, "VALIDATED", "DISCONNECTING");
+          VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, from state %s => %s", __func__, "VALIDATED", "DISCONNECTING");
 
           /*Action code for transition */
           //csrRoamDisconnect();
@@ -2605,7 +2605,7 @@
         else if((msg==(BTAMPFSM_EVENT_T)eWLAN_BAP_HCI_PHYSICAL_LINK_DISCONNECT))
         {
           /*Transition from VALIDATED to DISCONNECTING (both without substates)*/
-          VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, from state %s => %s", __FUNCTION__, "VALIDATED", "DISCONNECTING");
+          VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, from state %s => %s", __func__, "VALIDATED", "DISCONNECTING");
 
           /*Action code for transition */
           //csrRoamDisconnect();
@@ -2633,13 +2633,13 @@
         }
         else
         {
-          VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, in state %s, invalid event msg %d", __FUNCTION__, "VALIDATED", msg);
+          VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, in state %s, invalid event msg %d", __func__, "VALIDATED", msg);
           /* Intentionally left blank */
         }
       break;
 
       default:
-        VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, invalid state %d", __FUNCTION__, instanceVar->stateVar);
+        VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, invalid state %d", __func__, instanceVar->stateVar);
         /*Intentionally left blank*/
       break;
   }
@@ -2657,7 +2657,7 @@
    pMsg = vos_mem_malloc(sizeof(tAniBtAmpLogLinkReq));
    if ( NULL == pMsg ) 
    {
-      VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_ERROR, "In %s, failed to allocate mem for req", __FUNCTION__);
+      VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_ERROR, "In %s, failed to allocate mem for req", __func__);
       return VOS_STATUS_E_NOMEM;
    }
 
@@ -2672,7 +2672,7 @@
 
    if(VOS_STATUS_SUCCESS != vos_mq_post_message(VOS_MQ_ID_SME, &msg))
    {
-       VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_ERROR, "In %s, failed to post msg to self", __FUNCTION__);
+       VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_ERROR, "In %s, failed to post msg to self", __func__);
        vos_mem_free(pMsg);
        vosStatus = VOS_STATUS_E_FAILURE;
    }
@@ -2694,14 +2694,14 @@
         }
         else
         {
-            VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_ERROR, "In %s, btampContext is NULL", __FUNCTION__);                  
+            VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_ERROR, "In %s, btampContext is NULL", __func__);                  
             return;
         }
             
     }
     else
     {
-        VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_ERROR, "In %s, pBtAmpLogLinkReq is NULL", __FUNCTION__);    
+        VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_ERROR, "In %s, pBtAmpLogLinkReq is NULL", __func__);    
     }
     return;
 }