wlcore: make debug prints work without dynamic debug
authorArik Nemtsov <arik@wizery.com>
Thu, 2 Aug 2012 12:27:51 +0000 (15:27 +0300)
committerLuciano Coelho <luca@coelho.fi>
Thu, 27 Sep 2012 09:13:52 +0000 (12:13 +0300)
Make debug prints operational when dynamic debug is not defined.
This allows better debugging in production environments.

Change the driver prefix to "wlcore" while were at it.

Signed-off-by: Arik Nemtsov <arik@wizery.com>
Signed-off-by: Luciano Coelho <luca@coelho.fi>
drivers/net/wireless/ti/wlcore/debug.h

index 6b800b3cbea59fdeb7be9fbe395aea2988fbd682..db4bf5a68ce208c1fa3e98fbe848221051ce0ec5 100644 (file)
@@ -28,7 +28,7 @@
 #include <linux/bitops.h>
 #include <linux/printk.h>
 
-#define DRIVER_NAME "wl12xx"
+#define DRIVER_NAME "wlcore"
 #define DRIVER_PREFIX DRIVER_NAME ": "
 
 enum {
@@ -73,11 +73,21 @@ extern u32 wl12xx_debug_level;
 #define wl1271_info(fmt, arg...) \
        pr_info(DRIVER_PREFIX fmt "\n", ##arg)
 
+/* define the debug macro differently if dynamic debug is supported */
+#if defined(CONFIG_DYNAMIC_DEBUG)
 #define wl1271_debug(level, fmt, arg...) \
        do { \
-               if (level & wl12xx_debug_level) \
-                       pr_debug(DRIVER_PREFIX fmt "\n", ##arg); \
+               if (unlikely(level & wl12xx_debug_level)) \
+                       dynamic_pr_debug(DRIVER_PREFIX fmt "\n", ##arg); \
+       } while (0)
+#else
+#define wl1271_debug(level, fmt, arg...) \
+       do { \
+               if (unlikely(level & wl12xx_debug_level)) \
+                       printk(KERN_DEBUG pr_fmt(DRIVER_PREFIX fmt "\n"), \
+                              ##arg); \
        } while (0)
+#endif
 
 /* TODO: use pr_debug_hex_dump when it becomes available */
 #define wl1271_dump(level, prefix, buf, len)   \