From: H Hartley Sweeten <hsweeten@visionengravers.com>
Date: Tue, 26 Nov 2013 17:21:33 +0000 (-0700)
Subject: staging: comedi: ni_mio_common: remove DEBUG_STATUS_B messages
X-Git-Tag: next-20131128~9^2~3
X-Git-Url: https://git.kernelconcepts.de/?a=commitdiff_plain;h=9af01ca9b91e142958f1f20bee68c272e7ac0ccd;p=karo-tx-linux.git

staging: comedi: ni_mio_common: remove DEBUG_STATUS_B messages

Defining DEBUG_STATUS_B enables dumping of a status register during the
interrupt. These messages are just added noise. Remove them.

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/ni_mio_common.c b/drivers/staging/comedi/drivers/ni_mio_common.c
index 4bf0ef2b93d7..1ae8f97f07f2 100644
--- a/drivers/staging/comedi/drivers/ni_mio_common.c
+++ b/drivers/staging/comedi/drivers/ni_mio_common.c
@@ -54,7 +54,6 @@
 
 /* #define DEBUG_INTERRUPT */
 /* #define DEBUG_STATUS_A */
-/* #define DEBUG_STATUS_B */
 
 #include <linux/interrupt.h>
 #include <linux/sched.h>
@@ -267,11 +266,6 @@ static void ni_mio_print_status_a(int status);
 #else
 #define ni_mio_print_status_a(a)
 #endif
-#ifdef DEBUG_STATUS_B
-static void ni_mio_print_status_b(int status);
-#else
-#define ni_mio_print_status_b(a)
-#endif
 
 static int ni_ai_reset(struct comedi_device *dev, struct comedi_subdevice *s);
 #ifndef PCIDMA
@@ -1176,7 +1170,6 @@ static void handle_b_interrupt(struct comedi_device *dev,
 #ifdef DEBUG_INTERRUPT
 	printk("ni_mio_common: interrupt: b_status=%04x m1_status=%08x\n",
 	       b_status, ao_mite_status);
-	ni_mio_print_status_b(b_status);
 #endif
 
 #ifdef PCIDMA
@@ -1247,28 +1240,6 @@ static void ni_mio_print_status_a(int status)
 }
 #endif
 
-#ifdef DEBUG_STATUS_B
-static const char *const status_b_strings[] = {
-	"passthru1", "fifo", "G1_gate", "G1_TC",
-	"UI2_TC", "UPDATE", "UC_TC", "BC_TC",
-	"start1", "overrun", "start", "bc_tc_error",
-	"fifo_empty", "fifo_half_full", "fifo_full", "interrupt_b"
-};
-
-static void ni_mio_print_status_b(int status)
-{
-	int i;
-
-	printk("B status:");
-	for (i = 15; i >= 0; i--) {
-		if (status & (1 << i)) {
-			printk(" %s", status_b_strings[i]);
-		}
-	}
-	printk("\n");
-}
-#endif
-
 #ifndef PCIDMA
 
 static void ni_ao_fifo_load(struct comedi_device *dev,