Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 26fb5c58 authored by Robert P. J. Day's avatar Robert P. J. Day Committed by Linus Torvalds
Browse files

[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: default avatarRobert P. J. Day <rpjday@mindspring.com>
Acked-by: default avatarKarsten Keil <kkeil@suse.de>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent e3f2769e

drivers/isdn/hardware/avm/b1dma.c

+7 −7
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ 


static char *revision = "$Revision: 1.1.2.3 $";



#undef CONFIG_B1DMA_DEBUG

#undef AVM_B1DMA_DEBUG



/* ------------------------------------------------------------- */
@@ -391,16 +391,16 @@ static void b1dma_dispatch_tx(avmcard *card) 
			_put_slice(&p, skb->data, len);

		}

		txlen = (u8 *)p - (u8 *)dma->sendbuf.dmabuf;

#ifdef CONFIG_B1DMA_DEBUG

#ifdef AVM_B1DMA_DEBUG

		printk(KERN_DEBUG "tx: put msg len=%d\n", txlen);

#endif

	} else {

		txlen = skb->len-2;

#ifdef CONFIG_B1DMA_POLLDEBUG

#ifdef AVM_B1DMA_POLLDEBUG

		if (skb->data[2] == SEND_POLLACK)

			printk(KERN_INFO "%s: send ack\n", card->name);

#endif

#ifdef CONFIG_B1DMA_DEBUG

#ifdef AVM_B1DMA_DEBUG

		printk(KERN_DEBUG "tx: put 0x%x len=%d\n", 

		       skb->data[2], txlen);

#endif
@@ -450,7 +450,7 @@ static void b1dma_handle_rx(avmcard *card) 
	u32 ApplId, MsgLen, DataB3Len, NCCI, WindowSize;

	u8 b1cmd =  _get_byte(&p);



#ifdef CONFIG_B1DMA_DEBUG

#ifdef AVM_B1DMA_DEBUG

	printk(KERN_DEBUG "rx: 0x%x %lu\n", b1cmd, (unsigned long)dma->recvlen);

#endif
@@ -515,7 +515,7 @@ static void b1dma_handle_rx(avmcard *card) 
		break;



	case RECEIVE_START:

#ifdef CONFIG_B1DMA_POLLDEBUG

#ifdef AVM_B1DMA_POLLDEBUG

		printk(KERN_INFO "%s: receive poll\n", card->name);

#endif

		if (!suppress_pollack)
@@ -601,7 +601,7 @@ static void b1dma_handle_interrupt(avmcard *card) 
				rxlen = (dma->recvlen + 3) & ~3;

				b1dma_writel(card, dma->recvbuf.dmaaddr+4, AMCC_RXPTR);

				b1dma_writel(card, rxlen, AMCC_RXLEN);

#ifdef CONFIG_B1DMA_DEBUG

#ifdef AVM_B1DMA_DEBUG

			} else {

				printk(KERN_ERR "%s: rx not complete (%d).\n",

					card->name, rxlen);

drivers/isdn/hardware/avm/c4.c

+8 −8
Original line number Diff line number Diff line
@@ -28,8 +28,8 @@ 
#include <linux/isdn/capilli.h>

#include "avmcard.h"



#undef CONFIG_C4_DEBUG

#undef CONFIG_C4_POLLDEBUG

#undef AVM_C4_DEBUG

#undef AVM_C4_POLLDEBUG



/* ------------------------------------------------------------- */
@@ -420,7 +420,7 @@ static void c4_dispatch_tx(avmcard *card) 


	skb = skb_dequeue(&dma->send_queue);

	if (!skb) {

#ifdef CONFIG_C4_DEBUG

#ifdef AVM_C4_DEBUG

		printk(KERN_DEBUG "%s: tx underrun\n", card->name);

#endif

		return;
@@ -444,16 +444,16 @@ static void c4_dispatch_tx(avmcard *card) 
			_put_slice(&p, skb->data, len);

		}

		txlen = (u8 *)p - (u8 *)dma->sendbuf.dmabuf;

#ifdef CONFIG_C4_DEBUG

#ifdef AVM_C4_DEBUG

		printk(KERN_DEBUG "%s: tx put msg len=%d\n", card->name, txlen);

#endif

	} else {

		txlen = skb->len-2;

#ifdef CONFIG_C4_POLLDEBUG

#ifdef AVM_C4_POLLDEBUG

		if (skb->data[2] == SEND_POLLACK)

			printk(KERN_INFO "%s: ack to c4\n", card->name);

#endif

#ifdef CONFIG_C4_DEBUG

#ifdef AVM_C4_DEBUG

		printk(KERN_DEBUG "%s: tx put 0x%x len=%d\n",

				card->name, skb->data[2], txlen);

#endif
@@ -508,7 +508,7 @@ static void c4_handle_rx(avmcard *card) 
	u32 cidx;





#ifdef CONFIG_C4_DEBUG

#ifdef AVM_C4_DEBUG

	printk(KERN_DEBUG "%s: rx 0x%x len=%lu\n", card->name,

				b1cmd, (unsigned long)dma->recvlen);

#endif
@@ -586,7 +586,7 @@ static void c4_handle_rx(avmcard *card) 
		break;



	case RECEIVE_START:

#ifdef CONFIG_C4_POLLDEBUG

#ifdef AVM_C4_POLLDEBUG

		printk(KERN_INFO "%s: poll from c4\n", card->name);

#endif

		if (!suppress_pollack)