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

staging: comedi: addi_apci_3501: simplify eeprom read

This driver needs to read the on-board eeprom to determine the
number of analog output channels (4 or 8) on the board. But,
sinde we know the board has an eeprom and the PCI controller
chip is an AMCC S5933, we can simplify the code and remove the
code that sets the extra wait state neede for the AMCC S5920.
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 b2b82184
...@@ -173,7 +173,6 @@ static int apci3501_auto_attach(struct comedi_device *dev, ...@@ -173,7 +173,6 @@ static int apci3501_auto_attach(struct comedi_device *dev,
struct addi_private *devpriv; struct addi_private *devpriv;
struct comedi_subdevice *s; struct comedi_subdevice *s;
int ret, n_subdevices; int ret, n_subdevices;
unsigned int dw_Dummy;
this_board = addi_find_boardinfo(dev, pcidev); this_board = addi_find_boardinfo(dev, pcidev);
if (!this_board) if (!this_board)
...@@ -224,22 +223,7 @@ static int apci3501_auto_attach(struct comedi_device *dev, ...@@ -224,22 +223,7 @@ static int apci3501_auto_attach(struct comedi_device *dev,
dev->irq = pcidev->irq; dev->irq = pcidev->irq;
} }
/* Read eepeom and fill addi_board Structure */ addi_eeprom_read_info(dev, pci_resource_start(pcidev, 0));
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));
}
n_subdevices = 7; n_subdevices = 7;
ret = comedi_alloc_subdevices(dev, n_subdevices); ret = comedi_alloc_subdevices(dev, n_subdevices);
......
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