---

yaml --- r: 325125 b: refs/heads/master c: 3acf317 h: refs/heads/master i: 325123: 9af43aa v: v3
git-mirror · Sep 11, 2012 · 8168311 · 8168311
1 parent a64604e
commit 8168311
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 15 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 05841b3638715a32daeb2ba9fe543974f2f10bd1
+refs/heads/master: 3acf31763f3e499b6ba9a1eaabb98a1922883e55
diff --git a/trunk/drivers/staging/comedi/drivers/adl_pci9111.c b/trunk/drivers/staging/comedi/drivers/adl_pci9111.c
@@ -103,8 +103,6 @@ a multiple of chanlist_len*convert_arg.
 #define PCI9111_HR_AI_RESOLUTION_2_CMP_BIT	0x8000
 
 #define PCI9111_AI_ACQUISITION_PERIOD_MIN_NS	10000
-#define PCI9111_DI_CHANNEL_NBR			16
-#define	PCI9111_DO_CHANNEL_NBR			16
 
 #define PCI9111_RANGE_SETTING_DELAY		10
 #define PCI9111_AI_INSTANT_READ_UDELAY_US	2
@@ -1236,20 +1234,20 @@ static int pci9111_attach(struct comedi_device *dev,
 	s->insn_read	= pci9111_ao_insn_read;
 
 	s = &dev->subdevices[2];
-	s->type = COMEDI_SUBD_DI;
-	s->subdev_flags = SDF_READABLE;
-	s->n_chan = PCI9111_DI_CHANNEL_NBR;
-	s->maxdata = 1;
-	s->range_table = &range_digital;
-	s->insn_bits = pci9111_di_insn_bits;
+	s->type		= COMEDI_SUBD_DI;
+	s->subdev_flags	= SDF_READABLE;
+	s->n_chan	= 16;
+	s->maxdata	= 1;
+	s->range_table	= &range_digital;
+	s->insn_bits	= pci9111_di_insn_bits;
 
 	s = &dev->subdevices[3];
-	s->type = COMEDI_SUBD_DO;
-	s->subdev_flags = SDF_READABLE | SDF_WRITABLE;
-	s->n_chan = PCI9111_DO_CHANNEL_NBR;
-	s->maxdata = 1;
-	s->range_table = &range_digital;
-	s->insn_bits = pci9111_do_insn_bits;
+	s->type		= COMEDI_SUBD_DO;
+	s->subdev_flags	= SDF_READABLE | SDF_WRITABLE;
+	s->n_chan	= 16;
+	s->maxdata	= 1;
+	s->range_table	= &range_digital;
+	s->insn_bits	= pci9111_do_insn_bits;
 
 	dev_private->is_valid = 1;