commit 87054bae512d5a6433a1d76adad3df370037486f
author Madan Mohan Koyyalamudi <c_mkoyya@qca.qualcomm.com> Fri Nov 02 13:24:12 2012 -0700
committer Jeff Johnson <jjohnson@qca.qualcomm.com> Fri Nov 30 15:07:46 2012 -0800
tree ccbc0d9008517f2dd77cd81664eb01661e3362a6
parent 6dd8cb57b71c40948c7b55a6f8ce90fa45ca5e6b

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

CORE/VOSS/src/vos_memory.c

diff --git a/CORE/VOSS/src/vos_memory.c b/CORE/VOSS/src/vos_memory.c
index fef6093..0395608 100644
--- a/CORE/VOSS/src/vos_memory.c
+++ b/CORE/VOSS/src/vos_memory.c
@@ -113,7 +113,7 @@
        struct s_vos_mem_struct* memStruct;
  
        VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR,
-             "%s: List is not Empty. listSize %d ", __FUNCTION__, (int)listSize);
+             "%s: List is not Empty. listSize %d ", __func__, (int)listSize);
 
        do
        {
@@ -147,13 +147,13 @@
    if (size > (1024*1024))
    {
        VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR,
-               "%s: called with arg > 1024K; passed in %d !!!", __FUNCTION__,size); 
+               "%s: called with arg > 1024K; passed in %d !!!", __func__,size); 
        return NULL;
    }
    if (in_interrupt())
    {
        VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR, 
-               "%s is being called in interrupt context, using GPF_ATOMIC.", __FUNCTION__);
+               "%s is being called in interrupt context, using GPF_ATOMIC.", __func__);
        return kmalloc(size, GFP_ATOMIC);
       
    }
@@ -179,7 +179,7 @@
       if(VOS_STATUS_SUCCESS != vosStatus)
       {
          VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR, 
-             "%s: Unable to insert node into List vosStatus %d\n", __FUNCTION__, vosStatus);
+             "%s: Unable to insert node into List vosStatus %d\n", __func__, vosStatus);
       }
 
       memPtr = (v_VOID_t*)(memStruct + 1); 
@@ -217,7 +217,7 @@
         else
         {
             VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_FATAL,
-                      "%s: Unallocated memory (double free?)", __FUNCTION__);
+                      "%s: Unallocated memory (double free?)", __func__);
             VOS_ASSERT(0);
         }
     }
@@ -230,12 +230,12 @@
 #endif    
    if (size > (1024*1024))
    {
-       VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR, "%s: called with arg > 1024K; passed in %d !!!", __FUNCTION__,size); 
+       VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR, "%s: called with arg > 1024K; passed in %d !!!", __func__,size); 
        return NULL;
    }
    if (in_interrupt())
    {
-      VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR, "%s cannot be called from interrupt context!!!", __FUNCTION__);
+      VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR, "%s cannot be called from interrupt context!!!", __func__);
       return NULL;
    }
 #ifdef CONFIG_WCNSS_MEM_PRE_ALLOC
@@ -256,7 +256,7 @@
 
     if (in_interrupt())
     {
-      VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR, "%s cannot be called from interrupt context!!!", __FUNCTION__);
+      VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR, "%s cannot be called from interrupt context!!!", __func__);
       return;
     }
 #ifdef CONFIG_WCNSS_MEM_PRE_ALLOC
@@ -272,7 +272,7 @@
 {
    if (ptr == NULL)
    {
-      VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR, "%s called with NULL parameter ptr", __FUNCTION__);
+      VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR, "%s called with NULL parameter ptr", __func__);
       return;
    }
    memset(ptr, value, numBytes);
@@ -288,7 +288,7 @@
 
    if (ptr == NULL)
    {
-      VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR, "%s called with NULL parameter ptr", __FUNCTION__);
+      VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR, "%s called with NULL parameter ptr", __func__);
       return;
    }
    memset(ptr, 0, numBytes);
@@ -312,7 +312,7 @@
    {
       VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR,
                 "%s called with NULL parameter, source:%p destination:%p",
-                __FUNCTION__, pSrc, pDst);
+                __func__, pSrc, pDst);
       VOS_ASSERT(0);
       return;
    }
@@ -334,7 +334,7 @@
    {
       VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR,
                 "%s called with NULL parameter, source:%p destination:%p",
-                __FUNCTION__, pSrc, pDst);
+                __func__, pSrc, pDst);
       VOS_ASSERT(0);
       return;
    }
@@ -353,7 +353,7 @@
    {
       VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR,
                 "%s called with NULL parameter, p1:%p p2:%p",
-                __FUNCTION__, pMemory1, pMemory2);
+                __func__, pMemory1, pMemory2);
       VOS_ASSERT(0);
       return VOS_FALSE;
    }
@@ -400,7 +400,7 @@
 
    if (in_interrupt())
    {
-      VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR, "%s cannot be called from interrupt context!!!", __FUNCTION__);
+      VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR, "%s cannot be called from interrupt context!!!", __func__);
       return NULL;
    }
 
@@ -425,7 +425,7 @@
       if(VOS_STATUS_SUCCESS != vosStatus)
       {
          VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR, 
-             "%s: Unable to insert node into List vosStatus %d\n", __FUNCTION__, vosStatus);
+             "%s: Unable to insert node into List vosStatus %d\n", __func__, vosStatus);
       }
 
       memPtr = (v_VOID_t*)(memStruct + 1); 
@@ -468,7 +468,7 @@
 {
    if (in_interrupt())
    {
-      VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR, "%s cannot be called from interrupt context!!!", __FUNCTION__);
+      VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR, "%s cannot be called from interrupt context!!!", __func__);
       return NULL;
    }
    return kmalloc(size, GFP_KERNEL);