dect/linux-2.6
Archived
14
0
Fork 0
Code Releases Activity

staging: comedi: me4000: remove ISR_PDEBUG macro

Browse source 
The ISR_PDEBUG macro is used to output trace messages in the isr
routine. This shouldn't be in a mainline driver. Remove it.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Cc: Frank Mori Hess <fmhess@users.sourceforge.net>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
H Hartley Sweeten 2012-06-13 19:13:15 -07:00 committed by Greg Kroah-Hartman
parent d6cbe537c6
commit ef5bbfcb29
2 changed files with 1 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
drivers/staging/comedi/drivers/me4000.c
View file

@ -1451,12 +1451,8 @@ static irqreturn_t me4000_ai_isr(int irq, void *dev_id)
int c = 0; int c = 0;
long lval; long lval;
ISR_PDEBUG("me4000_ai_isr() is executed\n"); if (!dev->attached)
if (!dev->attached) {
ISR_PDEBUG("me4000_ai_isr() premature interrupt\n");
return IRQ_NONE; return IRQ_NONE;
}
/* Reset all events */ /* Reset all events */
s->async->events = 0; s->async->events = 0;
@ -1471,16 +1467,12 @@ static irqreturn_t me4000_ai_isr(int irq, void *dev_id)
if (inl(ai_context->irq_status_reg) & if (inl(ai_context->irq_status_reg) &
ME4000_IRQ_STATUS_BIT_AI_HF) { ME4000_IRQ_STATUS_BIT_AI_HF) {
ISR_PDEBUG
("me4000_ai_isr(): Fifo half full interrupt occurred\n");
/* Read status register to find out what happened */ /* Read status register to find out what happened */
tmp = inl(ai_context->ctrl_reg); tmp = inl(ai_context->ctrl_reg);
if (!(tmp & ME4000_AI_STATUS_BIT_FF_DATA) && if (!(tmp & ME4000_AI_STATUS_BIT_FF_DATA) &&
!(tmp & ME4000_AI_STATUS_BIT_HF_DATA) && !(tmp & ME4000_AI_STATUS_BIT_HF_DATA) &&
(tmp & ME4000_AI_STATUS_BIT_EF_DATA)) { (tmp & ME4000_AI_STATUS_BIT_EF_DATA)) {
ISR_PDEBUG("me4000_ai_isr(): Fifo full\n");
c = ME4000_AI_FIFO_COUNT; c = ME4000_AI_FIFO_COUNT;
/* /*
@ -1500,8 +1492,6 @@ static irqreturn_t me4000_ai_isr(int irq, void *dev_id)
} else if ((tmp & ME4000_AI_STATUS_BIT_FF_DATA) } else if ((tmp & ME4000_AI_STATUS_BIT_FF_DATA)
&& !(tmp & ME4000_AI_STATUS_BIT_HF_DATA) && !(tmp & ME4000_AI_STATUS_BIT_HF_DATA)
&& (tmp & ME4000_AI_STATUS_BIT_EF_DATA)) { && (tmp & ME4000_AI_STATUS_BIT_EF_DATA)) {
ISR_PDEBUG("me4000_ai_isr(): Fifo half full\n");
s->async->events |= COMEDI_CB_BLOCK; s->async->events |= COMEDI_CB_BLOCK;
c = ME4000_AI_FIFO_COUNT / 2; c = ME4000_AI_FIFO_COUNT / 2;
@ -1527,8 +1517,6 @@ static irqreturn_t me4000_ai_isr(int irq, void *dev_id)
"Undefined FIFO state\n", dev->minor); "Undefined FIFO state\n", dev->minor);
} }
ISR_PDEBUG("me4000_ai_isr(): Try to read %d values\n", c);
for (i = 0; i < c; i++) { for (i = 0; i < c; i++) {
/* Read value from data fifo */ /* Read value from data fifo */
lval = inl(ai_context->data_reg) & 0xFFFF; lval = inl(ai_context->data_reg) & 0xFFFF;
@ -1555,7 +1543,6 @@ static irqreturn_t me4000_ai_isr(int irq, void *dev_id)
} }
/* Work is done, so reset the interrupt */ /* Work is done, so reset the interrupt */
ISR_PDEBUG("me4000_ai_isr(): Reset fifo half full interrupt\n");
tmp |= ME4000_AI_CTRL_BIT_HF_IRQ_RESET; tmp |= ME4000_AI_CTRL_BIT_HF_IRQ_RESET;
outl(tmp, ai_context->ctrl_reg); outl(tmp, ai_context->ctrl_reg);
tmp &= ~ME4000_AI_CTRL_BIT_HF_IRQ_RESET; tmp &= ~ME4000_AI_CTRL_BIT_HF_IRQ_RESET;
@ -1563,9 +1550,6 @@ static irqreturn_t me4000_ai_isr(int irq, void *dev_id)
} }
if (inl(ai_context->irq_status_reg) & ME4000_IRQ_STATUS_BIT_SC) { if (inl(ai_context->irq_status_reg) & ME4000_IRQ_STATUS_BIT_SC) {
ISR_PDEBUG
("me4000_ai_isr(): Sample counter interrupt occurred\n");
s->async->events |= COMEDI_CB_BLOCK | COMEDI_CB_EOA; s->async->events |= COMEDI_CB_BLOCK | COMEDI_CB_EOA;
/* /*
@ -1593,16 +1577,12 @@ static irqreturn_t me4000_ai_isr(int irq, void *dev_id)
} }
/* Work is done, so reset the interrupt */ /* Work is done, so reset the interrupt */
ISR_PDEBUG
("me4000_ai_isr(): Reset interrupt from sample counter\n");
tmp |= ME4000_AI_CTRL_BIT_SC_IRQ_RESET; tmp |= ME4000_AI_CTRL_BIT_SC_IRQ_RESET;
outl(tmp, ai_context->ctrl_reg); outl(tmp, ai_context->ctrl_reg);
tmp &= ~ME4000_AI_CTRL_BIT_SC_IRQ_RESET; tmp &= ~ME4000_AI_CTRL_BIT_SC_IRQ_RESET;
outl(tmp, ai_context->ctrl_reg); outl(tmp, ai_context->ctrl_reg);
} }
ISR_PDEBUG("me4000_ai_isr(): Events = 0x%X\n", s->async->events);
if (s->async->events) if (s->async->events)
comedi_event(dev, s); comedi_event(dev, s);

8
drivers/staging/comedi/drivers/me4000.h
View file

@ -28,16 +28,8 @@
Debug section Debug section
===========================================================================*/ ===========================================================================*/
#undef ME4000_ISR_DEBUG /* Debug the interrupt service routine */
#undef ME4000_DEBUG /* General purpose debug masseges */ #undef ME4000_DEBUG /* General purpose debug masseges */
#ifdef ME4000_ISR_DEBUG
#undef ISR_PDEBUG
#define ISR_PDEBUG(fmt, args...) printk(KERN_DEBUG"comedi%d: me4000: " fmt, dev->minor, ##args)
#else
#define ISR_PDEBUG(fmt, args...) /* no debugging, do nothing */
#endif
#ifdef ME4000_DEBUG #ifdef ME4000_DEBUG
#undef PDEBUG #undef PDEBUG
#define PDEBUG(fmt, args...) printk(KERN_DEBUG"comedi%d: me4000: " fmt, dev->minor, ##args) #define PDEBUG(fmt, args...) printk(KERN_DEBUG"comedi%d: me4000: " fmt, dev->minor, ##args)