diff options
| author | David S. Miller <davem@sunset.davemloft.net> | 2005-03-22 03:37:26 -0800 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2005-03-22 03:37:26 -0800 |
| commit | 2e7eb6cc4a3691a7c6b7585893da9dffccaf3165 (patch) | |
| tree | 47dc39bb35a84f4e44debe19f6d478cac8524954 | |
| parent | c6f1a030e92e5188ee086eef3e8c4348b786f368 (diff) | |
[IRDA]: Squash warnings introduced by DEBUG cleanups.
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | include/net/irda/irda.h | 13 | ||||
| -rw-r--r-- | net/irda/iriap.c | 2 | ||||
| -rw-r--r-- | net/irda/irlmp.c | 4 |
3 files changed, 11 insertions, 8 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) diff --git a/net/irda/iriap.c b/net/irda/iriap.c index 10346c3d3ee8..b8bb78af8b8a 100644 --- a/net/irda/iriap.c +++ b/net/irda/iriap.c @@ -1057,7 +1057,7 @@ static int irias_seq_show(struct seq_file *seq, void *v) seq_putc(seq, '\n'); } - outloop: + IRDA_ASSERT_LABEL(outloop:) spin_unlock(&obj->attribs->hb_spinlock); } diff --git a/net/irda/irlmp.c b/net/irda/irlmp.c index c08dd61bf355..7a4a4d7fbe66 100644 --- a/net/irda/irlmp.c +++ b/net/irda/irlmp.c @@ -1738,7 +1738,7 @@ static int irlmp_slsap_inuse(__u8 slsap_sel) * Jean II */ errlsap: spin_unlock(&lap->lsaps->hb_spinlock); -errlap: +IRDA_ASSERT_LABEL(errlap:) spin_unlock_irqrestore(&irlmp->links->hb_spinlock, flags); return TRUE; @@ -1989,7 +1989,7 @@ static int irlmp_seq_show(struct seq_file *seq, void *v) seq_putc(seq, '\n'); } - outloop: + IRDA_ASSERT_LABEL(outloop:) spin_unlock(&lap->lsaps->hb_spinlock); seq_putc(seq, '\n'); } else |