staging: comedi: mite: remove MDPRINTK macro

This macro is used by the comedi drivers that usee the mite module to
output development function trace messages. These are just added noise.
Remove the messages as well as the macro.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/comedi/drivers/mite.c b/drivers/staging/comedi/drivers/mite.c
index 1a2191699351f16e50f674b3357b675c029343cc..447047faf6bf554c8c974150bc76ca35f15070bc 100644 (file)
--- a/drivers/staging/comedi/drivers/mite.c
+++ b/drivers/staging/comedi/drivers/mite.c
@@ -288,7 +288,6 @@ void mite_dma_arm(struct mite_channel *mite_chan)
        int chor;
        unsigned long flags;
 
-       MDPRINTK("mite_dma_arm ch%i\n", mite_chan->channel);
        /*
         * memory barrier is intended to insure any twiddling with the buffer
         * is done before writing to the mite to arm dma transfer
@@ -329,8 +328,6 @@ int mite_buf_change(struct mite_dma_descriptor_ring *ring,
 
        n_links = async->prealloc_bufsz >> PAGE_SHIFT;
 
-       MDPRINTK("ring->hw_dev=%p, n_links=0x%04x\n", ring->hw_dev, n_links);
-
        ring->descriptors =
            dma_alloc_coherent(ring->hw_dev,
                               n_links * sizeof(struct mite_dma_descriptor),
@@ -368,8 +365,6 @@ void mite_prep_dma(struct mite_channel *mite_chan,
        unsigned int chor, chcr, mcr, dcr, lkcr;
        struct mite_struct *mite = mite_chan->mite;
 
-       MDPRINTK("mite_prep_dma ch%i\n", mite_chan->channel);
-
        /* reset DMA and FIFO */
        chor = CHOR_DMARESET | CHOR_FRESET;
        writel(chor, mite->mite_io_addr + MITE_CHOR(mite_chan->channel));
@@ -448,8 +443,6 @@ void mite_prep_dma(struct mite_channel *mite_chan,
        /* starting address for link chaining */
        writel(mite_chan->ring->descriptors_dma_addr,
               mite->mite_io_addr + MITE_LKAR(mite_chan->channel));
-
-       MDPRINTK("exit mite_prep_dma\n");
 }
 EXPORT_SYMBOL_GPL(mite_prep_dma);
 
@@ -515,8 +508,6 @@ unsigned mite_dma_tcr(struct mite_channel *mite_chan)
 
        lkar = readl(mite->mite_io_addr + MITE_LKAR(mite_chan->channel));
        tcr = readl(mite->mite_io_addr + MITE_TCR(mite_chan->channel));
-       MDPRINTK("mite_dma_tcr ch%i, lkar=0x%08x tcr=%d\n", mite_chan->channel,
-                lkar, tcr);
 
        return tcr;
 }

diff --git a/drivers/staging/comedi/drivers/mite.h b/drivers/staging/comedi/drivers/mite.h
index 8423b8bf33845fe2489583385287ea8bbbb8d689..1d72149db9183c8185b180da8e67969aff2dd4f6 100644 (file)
--- a/drivers/staging/comedi/drivers/mite.h
+++ b/drivers/staging/comedi/drivers/mite.h
@@ -24,15 +24,8 @@
 #include <linux/slab.h>
 #include "../comedidev.h"
 
-/*  #define DEBUG_MITE */
 #define PCIMIO_COMPAT
 
-#ifdef DEBUG_MITE
-#define MDPRINTK(format, args...)      pr_debug(format , ## args)
-#else
-#define MDPRINTK(format, args...)      do { } while (0)
-#endif
-
 #define MAX_MITE_DMA_CHANNELS 8
 
 struct mite_dma_descriptor {

diff --git a/drivers/staging/comedi/drivers/ni_mio_common.c b/drivers/staging/comedi/drivers/ni_mio_common.c
index 5113397bfecf4c864a48aeca9ccd7cd7f718b60c..058185292b0ddb530d0a23f4eaba6f459cb92dbc 100644 (file)
--- a/drivers/staging/comedi/drivers/ni_mio_common.c
+++ b/drivers/staging/comedi/drivers/ni_mio_common.c
@@ -63,10 +63,6 @@
 #include "mite.h"
 #include "comedi_fc.h"
 
-#ifndef MDPRINTK
-#define MDPRINTK(format, args...)
-#endif
-
 /* A timeout count */
 #define NI_TIMEOUT 1000
 static const unsigned old_RTSI_clock_channel = 7;
@@ -1214,12 +1210,9 @@ static void handle_b_interrupt(struct comedi_device *dev,
                s->async->events |= COMEDI_CB_OVERFLOW;
        }
 
-       if (b_status & AO_BC_TC_St) {
-               MDPRINTK
-                   ("ni_mio_common: AO BC_TC status=0x%04x status2=0x%04x\n",
-                    b_status, devpriv->stc_readw(dev, AO_Status_2_Register));
+       if (b_status & AO_BC_TC_St)
                s->async->events |= COMEDI_CB_EOA;
-       }
+
 #ifndef PCIDMA
        if (b_status & AO_FIFO_Request_St) {
                int ret;
@@ -2392,7 +2385,6 @@ static int ni_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
        unsigned int stop_count;
        int interrupt_a_enable = 0;
 
-       MDPRINTK("ni_ai_cmd\n");
        if (dev->irq == 0) {
                comedi_error(dev, "cannot run command without an irq");
                return -EIO;
@@ -2630,15 +2622,11 @@ static int ni_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
 
                ni_set_bits(dev, Interrupt_A_Enable_Register,
                            interrupt_a_enable, 1);
-
-               MDPRINTK("Interrupt_A_Enable_Register = 0x%04x\n",
-                        devpriv->int_a_enable_reg);
        } else {
                /* interrupt on nothing */
                ni_set_bits(dev, Interrupt_A_Enable_Register, ~0, 0);
 
                /* XXX start polling if necessary */
-               MDPRINTK("interrupting on nothing\n");
        }
 
        /* end configuration */
@@ -2682,8 +2670,6 @@ static int ni_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
                break;
        }
 
-       MDPRINTK("exit ni_ai_cmd\n");
-
        return 0;
 }