---

yaml --- r: 337656 b: refs/heads/master c: a486baa h: refs/heads/master v: v3
git-mirror · Nov 6, 2012 · afabeb7 · afabeb7
1 parent 55542d1
commit afabeb7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 12 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2bb8b1dfe6837ca300a36e7d5c5c9a272aefe5a6
+refs/heads/master: a486baa6cf2f900f252686cc63afc165db11b6e2
diff --git a/trunk/drivers/staging/comedi/drivers/addi_apci_1032.c b/trunk/drivers/staging/comedi/drivers/addi_apci_1032.c
@@ -22,7 +22,6 @@ static const struct addi_board apci1032_boardtypes[] = {
 		.pc_EepromChip		= ADDIDATA_93C76,
 		.i_NbrDiChannel		= 32,
 		.interrupt		= v_APCI1032_Interrupt,
-		.reset			= i_APCI1032_Reset,
 		.di_config		= i_APCI1032_ConfigDigitalInput,
 		.di_read		= i_APCI1032_Read1DigitalInput,
 		.di_bits		= i_APCI1032_ReadMoreDigitalInput,
@@ -55,14 +54,6 @@ static irqreturn_t v_ADDI_Interrupt(int irq, void *d)
 	return IRQ_RETVAL(1);
 }
 
-static int i_ADDI_Reset(struct comedi_device *dev)
-{
-	const struct addi_board *this_board = comedi_board(dev);
-
-	this_board->reset(dev);
-	return 0;
-}
-
 static const void *addi_find_boardinfo(struct comedi_device *dev,
 				       struct pci_dev *pcidev)
 {
@@ -308,7 +299,7 @@ static int apci1032_attach_pci(struct comedi_device *dev,
 		s->type = COMEDI_SUBD_UNUSED;
 	}
 
-	i_ADDI_Reset(dev);
+	i_APCI1032_Reset(dev);
 	return 0;
 }
 
@@ -319,7 +310,7 @@ static void apci1032_detach(struct comedi_device *dev)
 
 	if (devpriv) {
 		if (dev->iobase)
-			i_ADDI_Reset(dev);
+			i_APCI1032_Reset(dev);
 		if (dev->irq)
 			free_irq(dev->irq, dev);
 		if (devpriv->dw_AiBase)