From cab14cd661675a64a25d73633d5d94c4cfdf20da Mon Sep 17 00:00:00 2001 From: H Hartley Sweeten Date: Thu, 1 Nov 2012 11:09:27 -0700 Subject: [PATCH] --- yaml --- r: 337571 b: refs/heads/master c: 48562c361fb11f30ae856065d335a0ae1516edde h: refs/heads/master i: 337569: 1b984e538db5bdc6e3308ee70eff155a1cc36587 337567: 91b09e0bbe5c3e92f077ed009a7fbab56fcb8436 v: v3 --- [refs] | 2 +- .../drivers/staging/comedi/drivers/addi_apci_1710.c | 13 ++----------- 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/[refs] b/[refs] index 60738fa8f35c..348271df011f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 678e4e27bc31c78b3a7171d6e26d7825c46d5c36 +refs/heads/master: 48562c361fb11f30ae856065d335a0ae1516edde diff --git a/trunk/drivers/staging/comedi/drivers/addi_apci_1710.c b/trunk/drivers/staging/comedi/drivers/addi_apci_1710.c index a5cfc9b9193d..fdc9060d6c4d 100644 --- a/trunk/drivers/staging/comedi/drivers/addi_apci_1710.c +++ b/trunk/drivers/staging/comedi/drivers/addi_apci_1710.c @@ -33,7 +33,6 @@ static const struct addi_board apci1710_boardtypes[] = { .i_IorangeBase2 = 256, .i_PCIEeprom = ADDIDATA_NO_EEPROM, .interrupt = v_APCI1710_Interrupt, - .reset = i_APCI1710_Reset, }, }; @@ -46,14 +45,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 *apci1710_find_boardinfo(struct comedi_device *dev, struct pci_dev *pcidev) { @@ -192,7 +183,7 @@ static int apci1710_attach_pci(struct comedi_device *dev, devpriv->s_BoardInfos.ui_Address = pci_resource_start(pcidev, 2); - i_ADDI_Reset(dev); + i_APCI1710_Reset(dev); return 0; } @@ -204,7 +195,7 @@ static void apci1710_detach(struct comedi_device *dev) if (devpriv) { if (dev->iobase) - i_ADDI_Reset(dev); + i_APCI1710_Reset(dev); if (dev->irq) free_irq(dev->irq, dev); if ((this_board->pc_EepromChip == NULL) ||