staging: wlags49_h2: Use C99 __func__

in DBG machinery so you don't have to declare DBG_FUNC at
the start of all functions.

This just makes it easy to add DBG conforming to existing code.

The patch reformats the changed #defines to satisfy checkstyle.pl

Signed-off-by: David Kilroy <kilroyd@googlemail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/staging/wlags49_h2/debug.h b/drivers/staging/wlags49_h2/debug.h
index 2c3dd140a35f40759905804eb75a4ac891b7273b..8d5dddf08055932e3372b3a69e5b6f17d4620fde 100644 (file)
--- a/drivers/staging/wlags49_h2/debug.h
+++ b/drivers/staging/wlags49_h2/debug.h
@@ -129,11 +129,15 @@
 #define _LEAVE_STR          "<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<"
 
 
-#define _DBG_ENTER(A)       DBG_PRINT("%s:%.*s:%s\n", DBG_NAME(A), ++DBG_LEVEL(A), _ENTER_STR, __FUNC__)
-#define _DBG_LEAVE(A)       DBG_PRINT("%s:%.*s:%s\n", DBG_NAME(A), DBG_LEVEL(A)--, _LEAVE_STR, __FUNC__)
+#define _DBG_ENTER(A)                                          \
+       DBG_PRINT("%s:%.*s:%s\n", DBG_NAME(A), ++DBG_LEVEL(A),  \
+                 _ENTER_STR, __func__)
+#define _DBG_LEAVE(A)                                          \
+       DBG_PRINT("%s:%.*s:%s\n", DBG_NAME(A), DBG_LEVEL(A)--,  \
+                 _LEAVE_STR, __func__)
 
 
-#define DBG_FUNC(F)         static const char *__FUNC__ = F;
+#define DBG_FUNC(F)
 
 #define DBG_ENTER(A)        {if (DBG_FLAGS(A) & DBG_TRACE_ON) \
                                _DBG_ENTER(A); }
@@ -145,29 +149,33 @@
                                DBG_PRINT("  %s -- "F"\n", N, S); }
 
 
-#define DBG_ERROR(A, S...)   {if (DBG_FLAGS(A) & DBG_ERROR_ON) {\
-                               DBG_PRINT("%s:ERROR:%s ", DBG_NAME(A), __FUNC__);\
-                               DBG_PRINTC(S); \
-                               DBG_TRAP; \
-                               } \
-                               }
+#define DBG_ERROR(A, S...) do {                                                \
+               if (DBG_FLAGS(A) & DBG_ERROR_ON) {                      \
+                       DBG_PRINT("%s:ERROR:%s ", DBG_NAME(A), __func__); \
+                       DBG_PRINTC(S);                                  \
+                       DBG_TRAP;                                       \
+               } } while (0)
 
 
-#define DBG_WARNING(A, S...) {if (DBG_FLAGS(A) & DBG_WARNING_ON) {\
-                               DBG_PRINT("%s:WARNING:%s ", DBG_NAME(A), __FUNC__);\
-                               DBG_PRINTC(S); } }
+#define DBG_WARNING(A, S...) do {                                      \
+               if (DBG_FLAGS(A) & DBG_WARNING_ON) {                    \
+                       DBG_PRINT("%s:WARNING:%s ", DBG_NAME(A), __func__); \
+                       DBG_PRINTC(S);                                  \
+               } } while (0)
 
 
-#define DBG_NOTICE(A, S...)  {if (DBG_FLAGS(A) & DBG_NOTICE_ON) {\
-                               DBG_PRINT("%s:NOTICE:%s ", DBG_NAME(A), __FUNC__);\
-                               DBG_PRINTC(S); \
-                               } \
-                               }
+#define DBG_NOTICE(A, S...)  do {                                      \
+               if (DBG_FLAGS(A) & DBG_NOTICE_ON) {                     \
+                       DBG_PRINT("%s:NOTICE:%s ", DBG_NAME(A), __func__); \
+                       DBG_PRINTC(S);                                  \
+               } } while (0)
 
 
-#define DBG_TRACE(A, S...)   do {if (DBG_FLAGS(A) & DBG_TRACE_ON) {\
-                               DBG_PRINT("%s:%s ", DBG_NAME(A), __FUNC__);\
-                               DBG_PRINTC(S); } } while (0)
+#define DBG_TRACE(A, S...)   do { \
+               if (DBG_FLAGS(A) & DBG_TRACE_ON) {                      \
+                       DBG_PRINT("%s:%s ", DBG_NAME(A), __func__);     \
+                       DBG_PRINTC(S);                                  \
+               } } while (0)
 
 
 #define DBG_RX(A, S...)      {if (DBG_FLAGS(A) & DBG_RX_ON) {\
@@ -181,13 +189,12 @@
                                DBG_PRINT(S); } }
 
 
-#define DBG_ASSERT(C)          { \
-                               if (!(C)) {\
-                                       DBG_PRINT("ASSERT(%s) -- %s#%d (%s)\n", \
-                                       #C, __FILE__, __LINE__, __FUNC__); \
-                                       DBG_TRAP; \
-                                       } \
-                                       }
+#define DBG_ASSERT(C) do { \
+               if (!(C)) {                                             \
+                       DBG_PRINT("ASSERT(%s) -- %s#%d (%s)\n",         \
+                                 #C, __FILE__, __LINE__, __func__);    \
+                       DBG_TRAP;                                       \
+               } } while (0)
 
 typedef struct {
     char           *dbgName;

diff --git a/drivers/staging/wlags49_h2/wl_netdev.c b/drivers/staging/wlags49_h2/wl_netdev.c
index cf917e613f22a087888168195749d4abf14ac9ad..1c9d4d0626f90a0a55365a302aed7a4f0b51c564 100644 (file)
--- a/drivers/staging/wlags49_h2/wl_netdev.c
+++ b/drivers/staging/wlags49_h2/wl_netdev.c
@@ -217,7 +217,7 @@ int wl_config( struct net_device *dev, struct ifmap *map )
 
     /* The only thing we care about here is a port change. Since this not needed,
        ignore the request. */
-    DBG_TRACE( DbgInfo, "%s: %s called.\n", dev->name, __FUNC__ );
+    DBG_TRACE(DbgInfo, "%s: %s called.\n", dev->name, __func__);
 
     DBG_LEAVE( DbgInfo );
     return 0;