summaryrefslogtreecommitdiff
path: root/include/net
diff options
context:
space:
mode:
authorDavid S. Miller <davem@sunset.davemloft.net>2005-03-22 03:37:26 -0800
committerDavid S. Miller <davem@sunset.davemloft.net>2005-03-22 03:37:26 -0800
commit2e7eb6cc4a3691a7c6b7585893da9dffccaf3165 (patch)
tree47dc39bb35a84f4e44debe19f6d478cac8524954 /include/net
parentc6f1a030e92e5188ee086eef3e8c4348b786f368 (diff)
[IRDA]: Squash warnings introduced by DEBUG cleanups.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net')
-rw-r--r--include/net/irda/irda.h13
1 files changed, 8 insertions, 5 deletions
diff --git a/include/net/irda/irda.h b/include/net/irda/irda.h
index d055e12fcf64..05a840837fe7 100644
--- a/include/net/irda/irda.h
+++ b/include/net/irda/irda.h
@@ -66,17 +66,20 @@ extern unsigned int irda_debug;
/* use 0 for production, 1 for verification, >2 for debug */
#define IRDA_DEBUG_LEVEL 0
-#define IRDA_DEBUG(n, args...) ( (irda_debug >= (n)) ? \
- (printk(KERN_DEBUG args)) : \
- 0 )
+#define IRDA_DEBUG(n, args...) \
+do { if (irda_debug >= (n)) \
+ printk(KERN_DEBUG args); \
+} while (0)
#define IRDA_ASSERT(expr, func) \
do { if(!(expr)) { \
printk( "Assertion failed! %s:%s:%d %s\n", \
__FILE__,__FUNCTION__,__LINE__,(#expr) ); \
func } } while (0)
+#define IRDA_ASSERT_LABEL(label) label
#else
-#define IRDA_DEBUG(n, args...) 0
-#define IRDA_ASSERT(expr, func) 0
+#define IRDA_DEBUG(n, args...) do { } while (0)
+#define IRDA_ASSERT(expr, func) do { (void)(expr); } while (0)
+#define IRDA_ASSERT_LABEL(label)
#endif /* CONFIG_IRDA_DEBUG */
#define IRDA_WARNING(args...) printk(KERN_WARNING args)