Commit 48562c36 authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman

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: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 678e4e27
...@@ -33,7 +33,6 @@ static const struct addi_board apci1710_boardtypes[] = { ...@@ -33,7 +33,6 @@ static const struct addi_board apci1710_boardtypes[] = {
.i_IorangeBase2 = 256, .i_IorangeBase2 = 256,
.i_PCIEeprom = ADDIDATA_NO_EEPROM, .i_PCIEeprom = ADDIDATA_NO_EEPROM,
.interrupt = v_APCI1710_Interrupt, .interrupt = v_APCI1710_Interrupt,
.reset = i_APCI1710_Reset,
}, },
}; };
...@@ -46,14 +45,6 @@ static irqreturn_t v_ADDI_Interrupt(int irq, void *d) ...@@ -46,14 +45,6 @@ static irqreturn_t v_ADDI_Interrupt(int irq, void *d)
return IRQ_RETVAL(1); 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, static const void *apci1710_find_boardinfo(struct comedi_device *dev,
struct pci_dev *pcidev) struct pci_dev *pcidev)
{ {
...@@ -192,7 +183,7 @@ static int apci1710_attach_pci(struct comedi_device *dev, ...@@ -192,7 +183,7 @@ static int apci1710_attach_pci(struct comedi_device *dev,
devpriv->s_BoardInfos.ui_Address = pci_resource_start(pcidev, 2); devpriv->s_BoardInfos.ui_Address = pci_resource_start(pcidev, 2);
i_ADDI_Reset(dev); i_APCI1710_Reset(dev);
return 0; return 0;
} }
...@@ -204,7 +195,7 @@ static void apci1710_detach(struct comedi_device *dev) ...@@ -204,7 +195,7 @@ static void apci1710_detach(struct comedi_device *dev)
if (devpriv) { if (devpriv) {
if (dev->iobase) if (dev->iobase)
i_ADDI_Reset(dev); i_APCI1710_Reset(dev);
if (dev->irq) if (dev->irq)
free_irq(dev->irq, dev); free_irq(dev->irq, dev);
if ((this_board->pc_EepromChip == NULL) || if ((this_board->pc_EepromChip == NULL) ||
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment