lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

staging: comedi: addi_apci_1710: remove eeprom handling code

Browse Source 
The apci1710 board does not have an eeprom. Remove the unnecessary
code to handle it.

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 11:09:43 -07:00
committed by Greg Kroah-Hartman
parent 48562c361f
commit ae6195f583
1 changed files with 7 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
drivers/staging/comedi/drivers/addi_apci_1710.c
View File

@@ -31,7 +31,6 @@ static const struct addi_board apci1710_boardtypes[] = {
.i_IorangeBase0 = 128, .i_IorangeBase0 = 128,
.i_IorangeBase1 = 8, .i_IorangeBase1 = 8,
.i_IorangeBase2 = 256, .i_IorangeBase2 = 256,
.i_PCIEeprom = ADDIDATA_NO_EEPROM,
.interrupt = v_APCI1710_Interrupt, .interrupt = v_APCI1710_Interrupt,
}, },
}; };
@@ -67,7 +66,6 @@ static int apci1710_attach_pci(struct comedi_device *dev,
struct addi_private *devpriv; struct addi_private *devpriv;
struct comedi_subdevice *s; struct comedi_subdevice *s;
int ret, pages, i, n_subdevices; int ret, pages, i, n_subdevices;
unsigned int dw_Dummy;
this_board = apci1710_find_boardinfo(dev, pcidev); this_board = apci1710_find_boardinfo(dev, pcidev);
if (!this_board) if (!this_board)
@@ -86,22 +84,14 @@ static int apci1710_attach_pci(struct comedi_device *dev,
if (this_board->i_Dma) if (this_board->i_Dma)
pci_set_master(pcidev); pci_set_master(pcidev);
if (!this_board->pc_EepromChip || if (this_board->i_IorangeBase1)
!strcmp(this_board->pc_EepromChip, ADDIDATA_9054)) { dev->iobase = pci_resource_start(pcidev, 1);
if (this_board->i_IorangeBase1) else
dev->iobase = pci_resource_start(pcidev, 1); dev->iobase = pci_resource_start(pcidev, 0);
else
dev->iobase = pci_resource_start(pcidev, 0);
devpriv->iobase = dev->iobase; devpriv->iobase = dev->iobase;
devpriv->i_IobaseAmcc = pci_resource_start(pcidev, 0); devpriv->i_IobaseAmcc = pci_resource_start(pcidev, 0);
devpriv->i_IobaseAddon = pci_resource_start(pcidev, 2); devpriv->i_IobaseAddon = pci_resource_start(pcidev, 2);
} else {
dev->iobase = pci_resource_start(pcidev, 2);
devpriv->iobase = pci_resource_start(pcidev, 2);
devpriv->dw_AiBase = ioremap(pci_resource_start(pcidev, 3),
this_board->i_IorangeBase3);
}
devpriv->i_IobaseReserved = pci_resource_start(pcidev, 3); devpriv->i_IobaseReserved = pci_resource_start(pcidev, 3);
/* Initialize parameters that can be overridden in EEPROM */ /* Initialize parameters that can be overridden in EEPROM */
@@ -128,23 +118,6 @@ static int apci1710_attach_pci(struct comedi_device *dev,
dev->irq = pcidev->irq; dev->irq = pcidev->irq;
} }
/* Read eepeom and fill addi_board Structure */
if (this_board->i_PCIEeprom) {
if (!(strcmp(this_board->pc_EepromChip, "S5920"))) {
/* Set 3 wait stait */
if (!(strcmp(dev->board_name, "apci035"))) {
outl(0x80808082, devpriv->i_IobaseAmcc + 0x60);
} else {
outl(0x83838383, devpriv->i_IobaseAmcc + 0x60);
}
/* Enable the interrupt for the controller */
dw_Dummy = inl(devpriv->i_IobaseAmcc + 0x38);
outl(dw_Dummy | 0x2000, devpriv->i_IobaseAmcc + 0x38);
}
addi_eeprom_read_info(dev, pci_resource_start(pcidev, 0));
}
devpriv->us_UseDma = ADDI_ENABLE; devpriv->us_UseDma = ADDI_ENABLE;
if (devpriv->s_EeParameters.i_Dma) { if (devpriv->s_EeParameters.i_Dma) {