staging: comedi: addi_apci_2032: simplify the PCI bar reading
The board supported by this driver has a 93c76 eeprom. Knowing this information allows simplifying the code that reads the PCI bars to get the iobase address. Also, since the 'dw_AiBase' is not ioremap'ed we can remove the iounmap in the detach. 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:
parent
791c9792ff
commit
70ff406599
|
@ -91,24 +91,10 @@ static int apci2032_auto_attach(struct comedi_device *dev,
|
||||||
if (ret)
|
if (ret)
|
||||||
return ret;
|
return ret;
|
||||||
|
|
||||||
if (!this_board->pc_EepromChip ||
|
dev->iobase = pci_resource_start(pcidev, 1);
|
||||||
strcmp(this_board->pc_EepromChip, ADDIDATA_9054)) {
|
devpriv->iobase = dev->iobase;
|
||||||
/* board does not have an eeprom or is not ADDIDATA_9054 */
|
devpriv->i_IobaseAmcc = pci_resource_start(pcidev, 0);
|
||||||
if (this_board->i_IorangeBase1)
|
devpriv->i_IobaseAddon = pci_resource_start(pcidev, 2);
|
||||||
dev->iobase = pci_resource_start(pcidev, 1);
|
|
||||||
else
|
|
||||||
dev->iobase = pci_resource_start(pcidev, 0);
|
|
||||||
|
|
||||||
devpriv->iobase = dev->iobase;
|
|
||||||
devpriv->i_IobaseAmcc = pci_resource_start(pcidev, 0);
|
|
||||||
devpriv->i_IobaseAddon = pci_resource_start(pcidev, 2);
|
|
||||||
} else {
|
|
||||||
/* board has an ADDIDATA_9054 eeprom */
|
|
||||||
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 */
|
||||||
|
@ -214,8 +200,6 @@ static void apci2032_detach(struct comedi_device *dev)
|
||||||
apci2032_reset(dev);
|
apci2032_reset(dev);
|
||||||
if (dev->irq)
|
if (dev->irq)
|
||||||
free_irq(dev->irq, dev);
|
free_irq(dev->irq, dev);
|
||||||
if (devpriv->dw_AiBase)
|
|
||||||
iounmap(devpriv->dw_AiBase);
|
|
||||||
}
|
}
|
||||||
if (pcidev) {
|
if (pcidev) {
|
||||||
if (dev->iobase)
|
if (dev->iobase)
|
||||||
|
|
Loading…
Reference in New Issue