Merge branch 'topic/powermac' into for-linus

[linux-2.6-omap-h63xx.git] / drivers / infiniband / hw / nes / nes.h

diff --git a/drivers/infiniband/hw/nes/nes.h b/drivers/infiniband/hw/nes/nes.h
index 1595dc7bba9dcd6f58d1ff9134f6002ebf9b31b7..13a5bb1a7bcf5895ce829e686eae14dc2ddd4980 100644 (file)
--- a/drivers/infiniband/hw/nes/nes.h
+++ b/drivers/infiniband/hw/nes/nes.h
@@ -137,14 +137,18 @@
 
 #ifdef CONFIG_INFINIBAND_NES_DEBUG
 #define nes_debug(level, fmt, args...) \
+do { \
        if (level & nes_debug_level) \
-               printk(KERN_ERR PFX "%s[%u]: " fmt, __func__, __LINE__, ##args)
-
-#define assert(expr)                                                \
-if (!(expr)) {                                                       \
-       printk(KERN_ERR PFX "Assertion failed! %s, %s, %s, line %d\n",  \
-                  #expr, __FILE__, __func__, __LINE__);                \
-}
+               printk(KERN_ERR PFX "%s[%u]: " fmt, __func__, __LINE__, ##args); \
+} while (0)
+
+#define assert(expr) \
+do { \
+       if (!(expr)) { \
+               printk(KERN_ERR PFX "Assertion failed! %s, %s, %s, line %d\n", \
+                          #expr, __FILE__, __func__, __LINE__); \
+       } \
+} while (0)
 
 #define NES_EVENT_TIMEOUT   1200000
 #else