aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert P. J. Day <rpjday@mindspring.com>2007-02-12 03:53:20 -0500
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-02-12 12:48:34 -0500
commit26fb5c5810afa0d8209ceff7cb267398be53829d (patch)
tree1996730cf72c9eb92011cac123963581f779f950
parente3f2769e6e896a5d734593e4842014cab220d027 (diff)
[PATCH] ISDN: Rename some debugging macros to not resemble CONFIG options
Rename some of the debugging macros for ISDN AVM so that they don't resemble kernel config settings, as they're primarily for author debugging instead. Signed-off-by: Robert P. J. Day <rpjday@mindspring.com> Acked-by: Karsten Keil <kkeil@suse.de> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--drivers/isdn/hardware/avm/b1dma.c14
-rw-r--r--drivers/isdn/hardware/avm/c4.c16
2 files changed, 15 insertions, 15 deletions
diff --git a/drivers/isdn/hardware/avm/b1dma.c b/drivers/isdn/hardware/avm/b1dma.c
index ddd47cdfdb1f..1e2d38e3d68c 100644
--- a/drivers/isdn/hardware/avm/b1dma.c
+++ b/drivers/isdn/hardware/avm/b1dma.c
@@ -29,7 +29,7 @@
29 29
30static char *revision = "$Revision: 1.1.2.3 $"; 30static char *revision = "$Revision: 1.1.2.3 $";
31 31
32#undef CONFIG_B1DMA_DEBUG 32#undef AVM_B1DMA_DEBUG
33 33
34/* ------------------------------------------------------------- */ 34/* ------------------------------------------------------------- */
35 35
@@ -391,16 +391,16 @@ static void b1dma_dispatch_tx(avmcard *card)
391 _put_slice(&p, skb->data, len); 391 _put_slice(&p, skb->data, len);
392 } 392 }
393 txlen = (u8 *)p - (u8 *)dma->sendbuf.dmabuf; 393 txlen = (u8 *)p - (u8 *)dma->sendbuf.dmabuf;
394#ifdef CONFIG_B1DMA_DEBUG 394#ifdef AVM_B1DMA_DEBUG
395 printk(KERN_DEBUG "tx: put msg len=%d\n", txlen); 395 printk(KERN_DEBUG "tx: put msg len=%d\n", txlen);
396#endif 396#endif
397 } else { 397 } else {
398 txlen = skb->len-2; 398 txlen = skb->len-2;
399#ifdef CONFIG_B1DMA_POLLDEBUG 399#ifdef AVM_B1DMA_POLLDEBUG
400 if (skb->data[2] == SEND_POLLACK) 400 if (skb->data[2] == SEND_POLLACK)
401 printk(KERN_INFO "%s: send ack\n", card->name); 401 printk(KERN_INFO "%s: send ack\n", card->name);
402#endif 402#endif
403#ifdef CONFIG_B1DMA_DEBUG 403#ifdef AVM_B1DMA_DEBUG
404 printk(KERN_DEBUG "tx: put 0x%x len=%d\n", 404 printk(KERN_DEBUG "tx: put 0x%x len=%d\n",
405 skb->data[2], txlen); 405 skb->data[2], txlen);
406#endif 406#endif
@@ -450,7 +450,7 @@ static void b1dma_handle_rx(avmcard *card)
450 u32 ApplId, MsgLen, DataB3Len, NCCI, WindowSize; 450 u32 ApplId, MsgLen, DataB3Len, NCCI, WindowSize;
451 u8 b1cmd = _get_byte(&p); 451 u8 b1cmd = _get_byte(&p);
452 452
453#ifdef CONFIG_B1DMA_DEBUG 453#ifdef AVM_B1DMA_DEBUG
454 printk(KERN_DEBUG "rx: 0x%x %lu\n", b1cmd, (unsigned long)dma->recvlen); 454 printk(KERN_DEBUG "rx: 0x%x %lu\n", b1cmd, (unsigned long)dma->recvlen);
455#endif 455#endif
456 456
@@ -515,7 +515,7 @@ static void b1dma_handle_rx(avmcard *card)
515 break; 515 break;
516 516
517 case RECEIVE_START: 517 case RECEIVE_START:
518#ifdef CONFIG_B1DMA_POLLDEBUG 518#ifdef AVM_B1DMA_POLLDEBUG
519 printk(KERN_INFO "%s: receive poll\n", card->name); 519 printk(KERN_INFO "%s: receive poll\n", card->name);
520#endif 520#endif
521 if (!suppress_pollack) 521 if (!suppress_pollack)
@@ -601,7 +601,7 @@ static void b1dma_handle_interrupt(avmcard *card)
601 rxlen = (dma->recvlen + 3) & ~3; 601 rxlen = (dma->recvlen + 3) & ~3;
602 b1dma_writel(card, dma->recvbuf.dmaaddr+4, AMCC_RXPTR); 602 b1dma_writel(card, dma->recvbuf.dmaaddr+4, AMCC_RXPTR);
603 b1dma_writel(card, rxlen, AMCC_RXLEN); 603 b1dma_writel(card, rxlen, AMCC_RXLEN);
604#ifdef CONFIG_B1DMA_DEBUG 604#ifdef AVM_B1DMA_DEBUG
605 } else { 605 } else {
606 printk(KERN_ERR "%s: rx not complete (%d).\n", 606 printk(KERN_ERR "%s: rx not complete (%d).\n",
607 card->name, rxlen); 607 card->name, rxlen);
diff --git a/drivers/isdn/hardware/avm/c4.c b/drivers/isdn/hardware/avm/c4.c
index 2a3eb38f0ebb..6f5efa8d78cb 100644
--- a/drivers/isdn/hardware/avm/c4.c
+++ b/drivers/isdn/hardware/avm/c4.c
@@ -28,8 +28,8 @@
28#include <linux/isdn/capilli.h> 28#include <linux/isdn/capilli.h>
29#include "avmcard.h" 29#include "avmcard.h"
30 30
31#undef CONFIG_C4_DEBUG 31#undef AVM_C4_DEBUG
32#undef CONFIG_C4_POLLDEBUG 32#undef AVM_C4_POLLDEBUG
33 33
34/* ------------------------------------------------------------- */ 34/* ------------------------------------------------------------- */
35 35
@@ -420,7 +420,7 @@ static void c4_dispatch_tx(avmcard *card)
420 420
421 skb = skb_dequeue(&dma->send_queue); 421 skb = skb_dequeue(&dma->send_queue);
422 if (!skb) { 422 if (!skb) {
423#ifdef CONFIG_C4_DEBUG 423#ifdef AVM_C4_DEBUG
424 printk(KERN_DEBUG "%s: tx underrun\n", card->name); 424 printk(KERN_DEBUG "%s: tx underrun\n", card->name);
425#endif 425#endif
426 return; 426 return;
@@ -444,16 +444,16 @@ static void c4_dispatch_tx(avmcard *card)
444 _put_slice(&p, skb->data, len); 444 _put_slice(&p, skb->data, len);
445 } 445 }
446 txlen = (u8 *)p - (u8 *)dma->sendbuf.dmabuf; 446 txlen = (u8 *)p - (u8 *)dma->sendbuf.dmabuf;
447#ifdef CONFIG_C4_DEBUG 447#ifdef AVM_C4_DEBUG
448 printk(KERN_DEBUG "%s: tx put msg len=%d\n", card->name, txlen); 448 printk(KERN_DEBUG "%s: tx put msg len=%d\n", card->name, txlen);
449#endif 449#endif
450 } else { 450 } else {
451 txlen = skb->len-2; 451 txlen = skb->len-2;
452#ifdef CONFIG_C4_POLLDEBUG 452#ifdef AVM_C4_POLLDEBUG
453 if (skb->data[2] == SEND_POLLACK) 453 if (skb->data[2] == SEND_POLLACK)
454 printk(KERN_INFO "%s: ack to c4\n", card->name); 454 printk(KERN_INFO "%s: ack to c4\n", card->name);
455#endif 455#endif
456#ifdef CONFIG_C4_DEBUG 456#ifdef AVM_C4_DEBUG
457 printk(KERN_DEBUG "%s: tx put 0x%x len=%d\n", 457 printk(KERN_DEBUG "%s: tx put 0x%x len=%d\n",
458 card->name, skb->data[2], txlen); 458 card->name, skb->data[2], txlen);
459#endif 459#endif
@@ -508,7 +508,7 @@ static void c4_handle_rx(avmcard *card)
508 u32 cidx; 508 u32 cidx;
509 509
510 510
511#ifdef CONFIG_C4_DEBUG 511#ifdef AVM_C4_DEBUG
512 printk(KERN_DEBUG "%s: rx 0x%x len=%lu\n", card->name, 512 printk(KERN_DEBUG "%s: rx 0x%x len=%lu\n", card->name,
513 b1cmd, (unsigned long)dma->recvlen); 513 b1cmd, (unsigned long)dma->recvlen);
514#endif 514#endif
@@ -586,7 +586,7 @@ static void c4_handle_rx(avmcard *card)
586 break; 586 break;
587 587
588 case RECEIVE_START: 588 case RECEIVE_START:
589#ifdef CONFIG_C4_POLLDEBUG 589#ifdef AVM_C4_POLLDEBUG
590 printk(KERN_INFO "%s: poll from c4\n", card->name); 590 printk(KERN_INFO "%s: poll from c4\n", card->name);
591#endif 591#endif
592 if (!suppress_pollack) 592 if (!suppress_pollack)