staging: comedi: mite: remove DEBUG_MITE code

The code protected by the DEBUG_MITE define outputs some development
debug information. This information is just added noise in the final
driver. Remove the code.

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 447047f..9c9a0ee 100644 (file)
--- a/drivers/staging/comedi/drivers/mite.c
+++ b/drivers/staging/comedi/drivers/mite.c
@@ -633,140 +633,6 @@ int mite_done(struct mite_channel *mite_chan)
 }
 EXPORT_SYMBOL_GPL(mite_done);
 
-#ifdef DEBUG_MITE
-
-/* names of bits in mite registers */
-
-static const char *const mite_CHOR_strings[] = {
-       "start", "cont", "stop", "abort",
-       "freset", "clrlc", "clrrb", "clrdone",
-       "clr_lpause", "set_lpause", "clr_send_tc",
-       "set_send_tc", "12", "13", "14",
-       "15", "16", "17", "18",
-       "19", "20", "21", "22",
-       "23", "24", "25", "26",
-       "27", "28", "29", "30",
-       "dmareset",
-};
-
-static const char *const mite_CHCR_strings[] = {
-       "continue", "ringbuff", "2", "3",
-       "4", "5", "6", "7",
-       "8", "9", "10", "11",
-       "12", "13", "bursten", "fifodis",
-       "clr_cont_rb_ie", "set_cont_rb_ie", "clr_lc_ie", "set_lc_ie",
-       "clr_drdy_ie", "set_drdy_ie", "clr_mrdy_ie", "set_mrdy_ie",
-       "clr_done_ie", "set_done_ie", "clr_sar_ie", "set_sar_ie",
-       "clr_linkp_ie", "set_linkp_ie", "clr_dma_ie", "set_dma_ie",
-};
-
-static const char *const mite_MCR_strings[] = {
-       "amdevice", "1", "2", "3",
-       "4", "5", "portio", "portvxi",
-       "psizebyte", "psizehalf (byte & half = word)", "aseqxp1", "11",
-       "12", "13", "blocken", "berhand",
-       "reqsintlim/reqs0", "reqs1", "reqs2", "rd32",
-       "rd512", "rl1", "rl2", "rl8",
-       "24", "25", "26", "27",
-       "28", "29", "30", "stopen",
-};
-
-static const char *const mite_DCR_strings[] = {
-       "amdevice", "1", "2", "3",
-       "4", "5", "portio", "portvxi",
-       "psizebyte", "psizehalf (byte & half = word)", "aseqxp1", "aseqxp2",
-       "aseqxp8", "13", "blocken", "berhand",
-       "reqsintlim", "reqs1", "reqs2", "rd32",
-       "rd512", "rl1", "rl2", "rl8",
-       "23", "24", "25", "27",
-       "28", "wsdevc", "wsdevs", "rwdevpack",
-};
-
-static const char *const mite_LKCR_strings[] = {
-       "amdevice", "1", "2", "3",
-       "4", "5", "portio", "portvxi",
-       "psizebyte", "psizehalf (byte & half = word)", "asequp", "aseqdown",
-       "12", "13", "14", "berhand",
-       "16", "17", "18", "rd32",
-       "rd512", "rl1", "rl2", "rl8",
-       "24", "25", "26", "27",
-       "28", "29", "30", "chngend",
-};
-
-static const char *const mite_CHSR_strings[] = {
-       "d.err0", "d.err1", "m.err0", "m.err1",
-       "l.err0", "l.err1", "drq0", "drq1",
-       "end", "xferr", "operr0", "operr1",
-       "stops", "habort", "sabort", "error",
-       "16", "conts_rb", "18", "linkc",
-       "20", "drdy", "22", "mrdy",
-       "24", "done", "26", "sars",
-       "28", "lpauses", "30", "int",
-};
-
-static void mite_decode(const char *const *bit_str, unsigned int bits)
-{
-       int i;
-
-       for (i = 31; i >= 0; i--) {
-               if (bits & (1 << i))
-                       pr_debug(" %s\n", bit_str[i]);
-       }
-}
-
-void mite_dump_regs(struct mite_channel *mite_chan)
-{
-       void __iomem *mite_io_addr = mite_chan->mite->mite_io_addr;
-       unsigned int offset;
-       unsigned int value;
-       int channel = mite_chan->channel;
-
-       pr_debug("mite_dump_regs ch%i\n", channel);
-       pr_debug("mite address is  =%p\n", mite_io_addr);
-
-       offset = MITE_CHOR(channel);
-       value = readl(mite_io_addr + offset);
-       pr_debug("mite status[CHOR] at 0x%08x =0x%08x\n", offset, value);
-       mite_decode(mite_CHOR_strings, value);
-       offset = MITE_CHCR(channel);
-       value = readl(mite_io_addr + offset);
-       pr_debug("mite status[CHCR] at 0x%08x =0x%08x\n", offset, value);
-       mite_decode(mite_CHCR_strings, value);
-       offset = MITE_TCR(channel);
-       value = readl(mite_io_addr + offset);
-       pr_debug("mite status[TCR] at 0x%08x =0x%08x\n", offset, value);
-       offset = MITE_MCR(channel);
-       value = readl(mite_io_addr + offset);
-       pr_debug("mite status[MCR] at 0x%08x =0x%08x\n", offset, value);
-       mite_decode(mite_MCR_strings, value);
-       offset = MITE_MAR(channel);
-       value = readl(mite_io_addr + offset);
-       pr_debug("mite status[MAR] at 0x%08x =0x%08x\n", offset, value);
-       offset = MITE_DCR(channel);
-       value = readl(mite_io_addr + offset);
-       pr_debug("mite status[DCR] at 0x%08x =0x%08x\n", offset, value);
-       mite_decode(mite_DCR_strings, value);
-       offset = MITE_DAR(channel);
-       value = readl(mite_io_addr + offset);
-       pr_debug("mite status[DAR] at 0x%08x =0x%08x\n", offset, value);
-       offset = MITE_LKCR(channel);
-       value = readl(mite_io_addr + offset);
-       pr_debug("mite status[LKCR] at 0x%08x =0x%08x\n", offset, value);
-       mite_decode(mite_LKCR_strings, value);
-       offset = MITE_LKAR(channel);
-       value = readl(mite_io_addr + offset);
-       pr_debug("mite status[LKAR] at 0x%08x =0x%08x\n", offset, value);
-       offset = MITE_CHSR(channel);
-       value = readl(mite_io_addr + offset);
-       pr_debug("mite status[CHSR] at 0x%08x =0x%08x\n", offset, value);
-       mite_decode(mite_CHSR_strings, value);
-       offset = MITE_FCR(channel);
-       value = readl(mite_io_addr + offset);
-       pr_debug("mite status[FCR] at 0x%08x =0x%08x\n", offset, value);
-}
-EXPORT_SYMBOL_GPL(mite_dump_regs);
-#endif
-
 static int __init mite_module_init(void)
 {
        return 0;

diff --git a/drivers/staging/comedi/drivers/mite.h b/drivers/staging/comedi/drivers/mite.h
index 1d72149..bcf2f97 100644 (file)
--- a/drivers/staging/comedi/drivers/mite.h
+++ b/drivers/staging/comedi/drivers/mite.h
@@ -122,11 +122,6 @@ void mite_prep_dma(struct mite_channel *mite_chan,
 int mite_buf_change(struct mite_dma_descriptor_ring *ring,
                    struct comedi_async *async);
 
-#ifdef DEBUG_MITE
-void mite_print_chsr(unsigned int chsr);
-void mite_dump_regs(struct mite_channel *mite_chan);
-#endif
-
 static inline int CHAN_OFFSET(int channel)
 {
        return 0x500 + 0x100 * channel;

diff --git a/drivers/staging/comedi/drivers/ni_mio_common.c b/drivers/staging/comedi/drivers/ni_mio_common.c
index 0581852..866e993 100644 (file)
--- a/drivers/staging/comedi/drivers/ni_mio_common.c
+++ b/drivers/staging/comedi/drivers/ni_mio_common.c
@@ -1063,7 +1063,6 @@ static void handle_a_interrupt(struct comedi_device *dev, unsigned short status,
                printk
                    ("unknown mite interrupt, ack! (ai_mite_status=%08x)\n",
                     ai_mite_status);
-               /* mite_print_chsr(ai_mite_status); */
                s->async->events |= COMEDI_CB_ERROR | COMEDI_CB_EOA;
                /* disable_irq(dev->irq); */
        }
@@ -1196,7 +1195,6 @@ static void handle_b_interrupt(struct comedi_device *dev,
                printk
                    ("unknown mite interrupt, ack! (ao_mite_status=%08x)\n",
                     ao_mite_status);
-               /* mite_print_chsr(ao_mite_status); */
                s->async->events |= COMEDI_CB_EOA | COMEDI_CB_ERROR;
        }
 #endif
@@ -2652,7 +2650,6 @@ static int ni_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
                if (retval)
                        return retval;
        }
-       /* mite_dump_regs(devpriv->mite); */
 #endif
 
        switch (cmd->start_src) {

diff --git a/drivers/staging/comedi/drivers/ni_pcidio.c b/drivers/staging/comedi/drivers/ni_pcidio.c
index b2af280..c7bc230 100644 (file)
--- a/drivers/staging/comedi/drivers/ni_pcidio.c
+++ b/drivers/staging/comedi/drivers/ni_pcidio.c
@@ -413,11 +413,7 @@ static irqreturn_t nidio_interrupt(int irq, void *d)
        spin_lock(&devpriv->mite_channel_lock);
        if (devpriv->di_mite_chan)
                m_status = mite_get_status(devpriv->di_mite_chan);
-#ifdef MITE_DEBUG
-       mite_print_chsr(m_status);
-#endif
 
-       /* mite_dump_regs(mite); */
        if (m_status & CHSR_INT) {
                if (m_status & CHSR_LINKC) {
                        writel(CHOR_CLRLC,