---

yaml --- r: 354166 b: refs/heads/master c: 87c38fb h: refs/heads/master v: v3
git-mirror · Jan 25, 2013 · 0c39449 · 0c39449
1 parent ca39020
commit 0c39449
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 11 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9f89ce8c62175e1f5bad495241ea34f288b2596c
+refs/heads/master: 87c38fbed5bb706785be9171ed4a9b41faf17e13
diff --git a/trunk/drivers/staging/comedi/drivers/addi_apci_3501.c b/trunk/drivers/staging/comedi/drivers/addi_apci_3501.c
@@ -50,7 +50,7 @@ static int apci3501_do_insn_bits(struct comedi_device *dev,
 	return insn->n;
 }
 
-static int i_ADDIDATA_InsnReadEeprom(struct comedi_device *dev,
+static int apci3501_eeprom_insn_read(struct comedi_device *dev,
 				     struct comedi_subdevice *s,
 				     struct comedi_insn *insn,
 				     unsigned int *data)
@@ -256,15 +256,11 @@ static int apci3501_auto_attach(struct comedi_device *dev,
 
 	/* EEPROM */
 	s = &dev->subdevices[6];
-	if (this_board->i_PCIEeprom) {
-		s->type = COMEDI_SUBD_MEMORY;
-		s->subdev_flags = SDF_READABLE | SDF_INTERNAL;
-		s->n_chan = 256;
-		s->maxdata = 0xffff;
-		s->insn_read = i_ADDIDATA_InsnReadEeprom;
-	} else {
-		s->type = COMEDI_SUBD_UNUSED;
-	}
+	s->type		= COMEDI_SUBD_MEMORY;
+	s->subdev_flags	= SDF_READABLE | SDF_INTERNAL;
+	s->n_chan	= 256;
+	s->maxdata	= 0xffff;
+	s->insn_read	= apci3501_eeprom_insn_read;
 
 	apci3501_reset(dev);
 	return 0;