evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

staging: comedi: addi_apci_3120: remove i_ADDI_Reset()

Browse source 
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 <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
H Hartley Sweeten 2012-11-01 17:28:24 -07:00 • committed by Greg Kroah-Hartman
parent 2a8796d65c
commit f538c37ded
1 changed files with 2 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
drivers/staging/comedi/drivers/addi_apci_3120.c
View file

@ -33,7 +33,6 @@ static const struct addi_board apci3120_boardtypes[] = {
.ui_MinAcquisitiontimeNs = 10000, .ui_MinAcquisitiontimeNs = 10000,
.ui_MinDelaytimeNs = 100000, .ui_MinDelaytimeNs = 100000,
.interrupt = v_APCI3120_Interrupt, .interrupt = v_APCI3120_Interrupt,
.reset = i_APCI3120_Reset,
.ao_write = i_APCI3120_InsnWriteAnalogOutput, .ao_write = i_APCI3120_InsnWriteAnalogOutput,
}, { }, {
.pc_DriverName = "apci3001", .pc_DriverName = "apci3001",
@ -54,7 +53,6 @@ static const struct addi_board apci3120_boardtypes[] = {
.ui_MinAcquisitiontimeNs = 10000, .ui_MinAcquisitiontimeNs = 10000,
.ui_MinDelaytimeNs = 100000, .ui_MinDelaytimeNs = 100000,
.interrupt = v_APCI3120_Interrupt, .interrupt = v_APCI3120_Interrupt,
.reset = i_APCI3120_Reset,
}, },
}; };
@ -67,14 +65,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)
{ {
@ -257,7 +247,7 @@ static int apci3120_attach_pci(struct comedi_device *dev,
s = &dev->subdevices[6]; s = &dev->subdevices[6];
s->type = COMEDI_SUBD_UNUSED; s->type = COMEDI_SUBD_UNUSED;
i_ADDI_Reset(dev); i_APCI3120_Reset(dev);
return 0; return 0;
} }
@ -269,7 +259,7 @@ static void apci3120_detach(struct comedi_device *dev)
if (devpriv) { if (devpriv) {
if (dev->iobase) if (dev->iobase)
i_ADDI_Reset(dev); i_APCI3120_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) ||