From: H Hartley Sweeten Date: Thu, 1 Nov 2012 18:09:27 +0000 (-0700) Subject: staging: comedi: addi_apci_1710: remove i_ADDI_Reset X-Git-Tag: firefly_0821_release~3680^2~1519^2~682 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=48562c361fb11f30ae856065d335a0ae1516edde;p=firefly-linux-kernel-4.4.55.git staging: comedi: addi_apci_1710: remove i_ADDI_Reset This driver is now separate from the "common" code used with the addi-data drivers. There is no need to use i_ADDI_Reset() to call the correct "reset" function. Remove the i_ADDI_Reset() function and the 'reset' pointer to the real function from the boardinfo and just call the function directly where needed. Signed-off-by: H Hartley Sweeten Cc: Ian Abbott Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/comedi/drivers/addi_apci_1710.c b/drivers/staging/comedi/drivers/addi_apci_1710.c index a5cfc9b9193d..fdc9060d6c4d 100644 --- a/drivers/staging/comedi/drivers/addi_apci_1710.c +++ b/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) ||