From: H Hartley Sweeten <hsweeten@visionengravers.com>
Date: Tue, 26 Nov 2013 17:21:34 +0000 (-0700)
Subject: staging: comedi: ni_mio_common: remove DEBUG_STATUS_A messages
X-Git-Tag: firefly_0821_release~176^2~4489^2~698
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=957a91418669d84de66f72f470972073992d6d7b;p=firefly-linux-kernel-4.4.55.git

staging: comedi: ni_mio_common: remove DEBUG_STATUS_A messages

Defining DEBUG_STATUS_A 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 1ae8f97f07f2..2ca37b611a91 100644
--- a/drivers/staging/comedi/drivers/ni_mio_common.c
+++ b/drivers/staging/comedi/drivers/ni_mio_common.c
@@ -53,7 +53,6 @@
 */
 
 /* #define DEBUG_INTERRUPT */
-/* #define DEBUG_STATUS_A */
 
 #include <linux/interrupt.h>
 #include <linux/sched.h>
@@ -261,12 +260,6 @@ static int ni_rtsi_insn_config(struct comedi_device *dev,
 static void caldac_setup(struct comedi_device *dev, struct comedi_subdevice *s);
 static int ni_read_eeprom(struct comedi_device *dev, int addr);
 
-#ifdef DEBUG_STATUS_A
-static void ni_mio_print_status_a(int status);
-#else
-#define ni_mio_print_status_a(a)
-#endif
-
 static int ni_ai_reset(struct comedi_device *dev, struct comedi_subdevice *s);
 #ifndef PCIDMA
 static void ni_handle_fifo_half_full(struct comedi_device *dev);
@@ -1040,7 +1033,6 @@ static void handle_a_interrupt(struct comedi_device *dev, unsigned short status,
 	printk
 	    ("ni_mio_common: interrupt: a_status=%04x ai_mite_status=%08x\n",
 	     status, ai_mite_status);
-	ni_mio_print_status_a(status);
 #endif
 #ifdef PCIDMA
 	if (ai_mite_status & CHSR_LINKC) {
@@ -1077,7 +1069,6 @@ static void handle_a_interrupt(struct comedi_device *dev, unsigned short status,
 			      AI_SC_TC_Error_St)) {
 			printk("ni_mio_common: ai error a_status=%04x\n",
 			       status);
-			ni_mio_print_status_a(status);
 
 			shutdown_ai_command(dev);
 
@@ -1218,28 +1209,6 @@ static void handle_b_interrupt(struct comedi_device *dev,
 	ni_event(dev, s);
 }
 
-#ifdef DEBUG_STATUS_A
-static const char *const status_a_strings[] = {
-	"passthru0", "fifo", "G0_gate", "G0_TC",
-	"stop", "start", "sc_tc", "start1",
-	"start2", "sc_tc_error", "overflow", "overrun",
-	"fifo_empty", "fifo_half_full", "fifo_full", "interrupt_a"
-};
-
-static void ni_mio_print_status_a(int status)
-{
-	int i;
-
-	printk("A status:");
-	for (i = 15; i >= 0; i--) {
-		if (status & (1 << i)) {
-			printk(" %s", status_a_strings[i]);
-		}
-	}
-	printk("\n");
-}
-#endif
-
 #ifndef PCIDMA
 
 static void ni_ao_fifo_load(struct comedi_device *dev,