From 7237fa55b3612da8afdf7b73557bf6b8a57cc1e5 Mon Sep 17 00:00:00 2001
From: H Hartley Sweeten <hsweeten@visionengravers.com>
Date: Fri, 22 Mar 2013 15:57:02 -0700
Subject: [PATCH] --- yaml --- r: 363751 b: refs/heads/master c:
 e4632a71faed3bcb0c77b19560e7369db0f5182e h: refs/heads/master i:   363749:
 d4e14eaddf55f23dbb8970d1fa2056e2005c07f4   363747:
 06b946a9e4666892b5af8cd7dc425c2f2ecfe23a   363743:
 c4b95171188dfe1e59954c1c55f2f745674f9b3a v: v3

---
 [refs]                                      |  2 +-
 trunk/drivers/staging/comedi/drivers/s626.c | 52 ++++++++++++---------
 2 files changed, 32 insertions(+), 22 deletions(-)

diff --git a/[refs] b/[refs]
index 214a6c92c086..5074164f702c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 90d54ff27e5d5cf0df6eb3cf351a8b2e26d94367
+refs/heads/master: e4632a71faed3bcb0c77b19560e7369db0f5182e
diff --git a/trunk/drivers/staging/comedi/drivers/s626.c b/trunk/drivers/staging/comedi/drivers/s626.c
index d5bf8c8d35d5..0a9638bcbcda 100644
--- a/trunk/drivers/staging/comedi/drivers/s626.c
+++ b/trunk/drivers/staging/comedi/drivers/s626.c
@@ -1101,32 +1101,42 @@ static int s626_ai_insn_config(struct comedi_device *dev,
 	return -EINVAL;
 }
 
-/* static int s626_ai_rinsn(struct comedi_device *dev,struct comedi_subdevice *s,struct comedi_insn *insn,unsigned int *data) */
-/* { */
-/*   struct s626_private *devpriv = dev->private; */
-/*   register uint8_t	i; */
-/*   register int32_t	*readaddr; */
+#ifdef unused_code
+static int s626_ai_rinsn(struct comedi_device *dev,
+			 struct comedi_subdevice *s,
+			 struct comedi_insn *insn,
+			 unsigned int *data)
+{
+	struct s626_private *devpriv = dev->private;
+	register uint8_t i;
+	register int32_t *readaddr;
 
-/*   Trigger ADC scan loop start by setting RPS Signal 0. */
-/*   MC_ENABLE( P_MC2, MC2_ADC_RPS ); */
+	/* Trigger ADC scan loop start (set RPS Signal 0) */
+	MC_ENABLE(P_MC2, MC2_ADC_RPS);
 
-/*   Wait until ADC scan loop is finished (RPS Signal 0 reset). */
-/*   while ( MC_TEST( P_MC2, MC2_ADC_RPS ) ); */
+	/* Wait until ADC scan loop is finished (RPS Signal 0 reset) */
+	while (MC_TEST(P_MC2, MC2_ADC_RPS))
+		;
 
-/* Init ptr to DMA buffer that holds new ADC data.  We skip the
- * first uint16_t in the buffer because it contains junk data from
- * the final ADC of the previous poll list scan.
- */
-/*   readaddr = (uint32_t *)devpriv->ANABuf.LogicalBase + 1; */
+	/*
+	 * Init ptr to DMA buffer that holds new ADC data.  We skip the
+	 * first uint16_t in the buffer because it contains junk data from
+	 * the final ADC of the previous poll list scan.
+	 */
+	readaddr = (uint32_t *)devpriv->ANABuf.LogicalBase + 1;
 
-/*  Convert ADC data to 16-bit integer values and copy to application buffer. */
-/*   for ( i = 0; i < devpriv->AdcItems; i++ ) { */
-/*     *data = s626_ai_reg_to_uint( *readaddr++ ); */
-/*     data++; */
-/*   } */
+	/*
+	 * Convert ADC data to 16-bit integer values and
+	 * copy to application buffer.
+	 */
+	for (i = 0; i < devpriv->AdcItems; i++) {
+		*data = s626_ai_reg_to_uint(*readaddr++);
+		data++;
+	}
 
-/*   return i; */
-/* } */
+	return i;
+}
+#endif
 
 static int s626_ai_insn_read(struct comedi_device *dev,
 			     struct comedi_subdevice *s,