Staging: crystalhd: crystalhd_misc: improved debug macros

Improvement of debug macros to ensure safe use on if/else statements.

Signed-off-by: Jorgyano Vieira <jorgyano@gmail.com>
Acked-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

1 files changed, 25 insertions, 21 deletions

diff --git a/drivers/staging/crystalhd/crystalhd_misc.h b/drivers/staging/crystalhd/crystalhd_misc.h
index 4d617235742..e0aa361c393 100644
--- a/drivers/staging/crystalhd/crystalhd_misc.h
+++ b/drivers/staging/crystalhd/crystalhd_misc.h
@@ -203,26 +203,30 @@ enum _chd_log_levels {
         BCMLOG_ENTER_LEAVE      = 0x00000008,   /* stack tracking */
 };
 
-#define BCMLOG_ENTER                            \
-if (g_linklog_level & BCMLOG_ENTER_LEAVE) {     \
-        printk(KERN_DEBUG "Entered %s\n", __func__);    \
-}
-
-#define BCMLOG_LEAVE                            \
-if (g_linklog_level & BCMLOG_ENTER_LEAVE) {     \
-        printk(KERN_DEBUG "Leaving %s\n", __func__);    \
-}
-
-#define BCMLOG(trace, fmt, args...)             \
-if (g_linklog_level & trace) {                  \
-        printk(fmt, ##args);                    \
-}
-
-#define BCMLOG_ERR(fmt, args...)                                        \
-do {                                                                    \
-        if (g_linklog_level & BCMLOG_ERROR) {                           \
-                printk(KERN_ERR "*ERR*:%s:%d: "fmt, __FILE__, __LINE__, ##args);        \
-        }                                                               \
-} while (0);
+#define BCMLOG_ENTER                                            \
+do {                                                            \
+        if (g_linklog_level & BCMLOG_ENTER_LEAVE)               \
+                printk(KERN_DEBUG "Entered %s\n", __func__);    \
+} while (0)
+
+#define BCMLOG_LEAVE                                            \
+do {                                                            \
+        if (g_linklog_level & BCMLOG_ENTER_LEAVE)               \
+                printk(KERN_DEBUG "Leaving %s\n", __func__);    \
+} while (0)                                                     \
+
+#define BCMLOG(trace, fmt, args...)     \
+do {                                    \
+        if (g_linklog_level & trace)    \
+                printk(fmt, ##args);    \
+} while (0)
+
+
+#define BCMLOG_ERR(fmt, args...)                                \
+do {                                                            \
+        if (g_linklog_level & BCMLOG_ERROR)                     \
+                printk(KERN_ERR "*ERR*:%s:%d: "fmt,             \
+                                __FILE__, __LINE__, ##args);    \
+} while (0)
 
 #endif