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

staging: comedi: addi_apci_1032: 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>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 2bb8b1df
...@@ -22,7 +22,6 @@ static const struct addi_board apci1032_boardtypes[] = { ...@@ -22,7 +22,6 @@ static const struct addi_board apci1032_boardtypes[] = {
.pc_EepromChip = ADDIDATA_93C76, .pc_EepromChip = ADDIDATA_93C76,
.i_NbrDiChannel = 32, .i_NbrDiChannel = 32,
.interrupt = v_APCI1032_Interrupt, .interrupt = v_APCI1032_Interrupt,
.reset = i_APCI1032_Reset,
.di_config = i_APCI1032_ConfigDigitalInput, .di_config = i_APCI1032_ConfigDigitalInput,
.di_read = i_APCI1032_Read1DigitalInput, .di_read = i_APCI1032_Read1DigitalInput,
.di_bits = i_APCI1032_ReadMoreDigitalInput, .di_bits = i_APCI1032_ReadMoreDigitalInput,
...@@ -55,14 +54,6 @@ static irqreturn_t v_ADDI_Interrupt(int irq, void *d) ...@@ -55,14 +54,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 *addi_find_boardinfo(struct comedi_device *dev, static const void *addi_find_boardinfo(struct comedi_device *dev,
struct pci_dev *pcidev) struct pci_dev *pcidev)
{ {
...@@ -308,7 +299,7 @@ static int apci1032_attach_pci(struct comedi_device *dev, ...@@ -308,7 +299,7 @@ static int apci1032_attach_pci(struct comedi_device *dev,
s->type = COMEDI_SUBD_UNUSED; s->type = COMEDI_SUBD_UNUSED;
} }
i_ADDI_Reset(dev); i_APCI1032_Reset(dev);
return 0; return 0;
} }
...@@ -319,7 +310,7 @@ static void apci1032_detach(struct comedi_device *dev) ...@@ -319,7 +310,7 @@ static void apci1032_detach(struct comedi_device *dev)
if (devpriv) { if (devpriv) {
if (dev->iobase) if (dev->iobase)
i_ADDI_Reset(dev); i_APCI1032_Reset(dev);
if (dev->irq) if (dev->irq)
free_irq(dev->irq, dev); free_irq(dev->irq, dev);
if (devpriv->dw_AiBase) if (devpriv->dw_AiBase)
......
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