diff options
author | Tilman Schmidt <tilman@imap.cc> | 2006-04-11 01:55:08 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-04-11 09:18:49 -0400 |
commit | d48c77841a71ba552ef4e6a862642073652f4473 (patch) | |
tree | 98e76d8bd9962eba7f5897e9d24acacc88b4e1f6 /drivers/isdn/gigaset/isocdata.c | |
parent | b1d47464c947f08125dc4ac4a2321ced9e2fed29 (diff) |
[PATCH] isdn4linux: Siemens Gigaset drivers: remove IFNULL macros
With Hansjoerg Lipp <hjlipp@web.de>
Remove the IFNULL debugging macros from the Gigaset drivers.
Signed-off-by: Hansjoerg Lipp <hjlipp@web.de>
Signed-off-by: Tilman Schmidt <tilman@imap.cc>
Cc: Karsten Keil <kkeil@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/isdn/gigaset/isocdata.c')
-rw-r--r-- | drivers/isdn/gigaset/isocdata.c | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/drivers/isdn/gigaset/isocdata.c b/drivers/isdn/gigaset/isocdata.c index 4a00d22c496..0b7e5b610cc 100644 --- a/drivers/isdn/gigaset/isocdata.c +++ b/drivers/isdn/gigaset/isocdata.c | |||
@@ -247,8 +247,6 @@ static inline void dump_bytes(enum debuglevel level, const char *tag, | |||
247 | static char dbgline[3 * 32 + 1]; | 247 | static char dbgline[3 * 32 + 1]; |
248 | static const char hexdigit[] = "0123456789abcdef"; | 248 | static const char hexdigit[] = "0123456789abcdef"; |
249 | int i = 0; | 249 | int i = 0; |
250 | IFNULLRET(tag); | ||
251 | IFNULLRET(bytes); | ||
252 | while (count-- > 0) { | 250 | while (count-- > 0) { |
253 | if (i > sizeof(dbgline) - 4) { | 251 | if (i > sizeof(dbgline) - 4) { |
254 | dbgline[i] = '\0'; | 252 | dbgline[i] = '\0'; |
@@ -663,14 +661,10 @@ static unsigned char bitcounts[256] = { | |||
663 | static inline void hdlc_unpack(unsigned char *src, unsigned count, | 661 | static inline void hdlc_unpack(unsigned char *src, unsigned count, |
664 | struct bc_state *bcs) | 662 | struct bc_state *bcs) |
665 | { | 663 | { |
666 | struct bas_bc_state *ubc; | 664 | struct bas_bc_state *ubc = bcs->hw.bas; |
667 | int inputstate; | 665 | int inputstate; |
668 | unsigned seqlen, inbyte, inbits; | 666 | unsigned seqlen, inbyte, inbits; |
669 | 667 | ||
670 | IFNULLRET(bcs); | ||
671 | ubc = bcs->hw.bas; | ||
672 | IFNULLRET(ubc); | ||
673 | |||
674 | /* load previous state: | 668 | /* load previous state: |
675 | * inputstate = set of flag bits: | 669 | * inputstate = set of flag bits: |
676 | * - INS_flag_hunt: no complete opening flag received since connection setup or last abort | 670 | * - INS_flag_hunt: no complete opening flag received since connection setup or last abort |
@@ -995,11 +989,7 @@ void gigaset_isoc_input(struct inbuf_t *inbuf) | |||
995 | */ | 989 | */ |
996 | int gigaset_isoc_send_skb(struct bc_state *bcs, struct sk_buff *skb) | 990 | int gigaset_isoc_send_skb(struct bc_state *bcs, struct sk_buff *skb) |
997 | { | 991 | { |
998 | int len; | 992 | int len = skb->len; |
999 | |||
1000 | IFNULLRETVAL(bcs, -EFAULT); | ||
1001 | IFNULLRETVAL(skb, -EFAULT); | ||
1002 | len = skb->len; | ||
1003 | 993 | ||
1004 | skb_queue_tail(&bcs->squeue, skb); | 994 | skb_queue_tail(&bcs->squeue, skb); |
1005 | gig_dbg(DEBUG_ISO, "%s: skb queued, qlen=%d", | 995 | gig_dbg(DEBUG_ISO, "%s: skb queued, qlen=%d", |