From ae9b6dd7460ca11142f9382028e307bf4d852872 Mon Sep 17 00:00:00 2001
From: H Hartley Sweeten <hsweeten@visionengravers.com>
Date: Tue, 5 Feb 2013 17:25:28 -0700
Subject: [PATCH] --- yaml --- r: 354443 b: refs/heads/master c:
 268e5148aac3108ad1347f9ecf637be3d83e525e h: refs/heads/master i:   354441:
 3190c0176cb323a3e53c02b0225460625fe85d03   354439:
 5424e01507633f9a7cc79eec5fdc39befa365351 v: v3

---
 [refs]                                        |  2 +-
 .../drivers/staging/comedi/drivers/vmk80xx.c  | 33 ++++++++++---------
 2 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/[refs] b/[refs]
index 349441bcf63a..a7e7110d2675 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8b3ec9f155cf564e0f2320b6a895d8684f2874fe
+refs/heads/master: 268e5148aac3108ad1347f9ecf637be3d83e525e
diff --git a/trunk/drivers/staging/comedi/drivers/vmk80xx.c b/trunk/drivers/staging/comedi/drivers/vmk80xx.c
index be65da1de242..d34e9adf4d23 100644
--- a/trunk/drivers/staging/comedi/drivers/vmk80xx.c
+++ b/trunk/drivers/staging/comedi/drivers/vmk80xx.c
@@ -162,7 +162,7 @@ struct vmk80xx_board {
 	int ai_nchans;
 	unsigned int ai_maxdata;
 	int ao_nchans;
-	__u8 di_chans;
+	int di_nchans;
 	__le16 cnt_bits;
 	__u8 pwm_chans;
 	__le16 pwm_bits;
@@ -176,7 +176,7 @@ static const struct vmk80xx_board vmk80xx_boardinfo[] = {
 		.ai_nchans	= 2,
 		.ai_maxdata	= 0x00ff,
 		.ao_nchans	= 2,
-		.di_chans	= 6,
+		.di_nchans	= 6,
 		.cnt_bits	= 16,
 		.pwm_chans	= 0,
 		.pwm_bits	= 0,
@@ -188,7 +188,7 @@ static const struct vmk80xx_board vmk80xx_boardinfo[] = {
 		.ai_nchans	= 8,
 		.ai_maxdata	= 0x03ff,
 		.ao_nchans	= 8,
-		.di_chans	= 8,
+		.di_nchans	= 8,
 		.cnt_bits	= 0,
 		.pwm_chans	= 1,
 		.pwm_bits	= 10,
@@ -663,9 +663,10 @@ static int vmk80xx_ao_insn_read(struct comedi_device *dev,
 	return n;
 }
 
-static int vmk80xx_di_bits(struct comedi_device *dev,
-			   struct comedi_subdevice *s,
-			   struct comedi_insn *insn, unsigned int *data)
+static int vmk80xx_di_insn_bits(struct comedi_device *dev,
+				struct comedi_subdevice *s,
+				struct comedi_insn *insn,
+				unsigned int *data)
 {
 	struct vmk80xx_private *devpriv = dev->private;
 	unsigned char *rx_buf;
@@ -705,9 +706,10 @@ static int vmk80xx_di_bits(struct comedi_device *dev,
 	return retval;
 }
 
-static int vmk80xx_di_rinsn(struct comedi_device *dev,
-			    struct comedi_subdevice *s,
-			    struct comedi_insn *insn, unsigned int *data)
+static int vmk80xx_di_insn_read(struct comedi_device *dev,
+				struct comedi_subdevice *s,
+				struct comedi_insn *insn,
+				unsigned int *data)
 {
 	struct vmk80xx_private *devpriv = dev->private;
 	int chan;
@@ -1219,12 +1221,13 @@ static int vmk80xx_attach_common(struct comedi_device *dev)
 
 	/* Digital input subdevice */
 	s = &dev->subdevices[2];
-	s->type = COMEDI_SUBD_DI;
-	s->subdev_flags = SDF_READABLE | SDF_GROUND;
-	s->n_chan = boardinfo->di_chans;
-	s->maxdata = 1;
-	s->insn_read = vmk80xx_di_rinsn;
-	s->insn_bits = vmk80xx_di_bits;
+	s->type		= COMEDI_SUBD_DI;
+	s->subdev_flags	= SDF_READABLE;
+	s->n_chan	= boardinfo->di_nchans;
+	s->maxdata	= 1;
+	s->range_table	= &range_digital;
+	s->insn_read	= vmk80xx_di_insn_read;
+	s->insn_bits	= vmk80xx_di_insn_bits;
 
 	/* Digital output subdevice */
 	s = &dev->subdevices[3];