From ebea8c69d323acfc13f85b067a8608ec10794638 Mon Sep 17 00:00:00 2001 From: H Hartley Sweeten Date: Fri, 18 Jan 2013 10:44:11 -0700 Subject: [PATCH] staging: comedi: addi_apci_16xx: simplify PCI bar reading The boards supported by this driver do not have an eeprom. Knowing this information allows simplifying the code that reads the PCI bars to get the iobase addresses. The only 'iobase' actually used by this driver is found in PCI bar 0. Don't bother reading the other PCI bars. Also, since 'dw_AiBase' is not ioremap'ed we can remove the check and iounmap in the detach. Signed-off-by: H Hartley Sweeten Cc: Ian Abbott Signed-off-by: Greg Kroah-Hartman --- .../staging/comedi/drivers/addi_apci_16xx.c | 30 ++----------------- 1 file changed, 2 insertions(+), 28 deletions(-) diff --git a/drivers/staging/comedi/drivers/addi_apci_16xx.c b/drivers/staging/comedi/drivers/addi_apci_16xx.c index ba4b0b10defc..e87ae3560ba9 100644 --- a/drivers/staging/comedi/drivers/addi_apci_16xx.c +++ b/drivers/staging/comedi/drivers/addi_apci_16xx.c @@ -14,8 +14,6 @@ static const struct addi_board apci16xx_boardtypes[] = { .pc_DriverName = "apci1648", .i_VendorId = PCI_VENDOR_ID_ADDIDATA, .i_DeviceId = 0x1009, - .i_IorangeBase0 = 128, - .i_PCIEeprom = ADDIDATA_NO_EEPROM, .i_NbrTTLChannel = 48, .ttl_config = i_APCI16XX_InsnConfigInitTTLIO, .ttl_bits = i_APCI16XX_InsnBitsReadTTLIO, @@ -25,8 +23,6 @@ static const struct addi_board apci16xx_boardtypes[] = { .pc_DriverName = "apci1696", .i_VendorId = PCI_VENDOR_ID_ADDIDATA, .i_DeviceId = 0x100A, - .i_IorangeBase0 = 128, - .i_PCIEeprom = ADDIDATA_NO_EEPROM, .i_NbrTTLChannel = 96, .ttl_config = i_APCI16XX_InsnConfigInitTTLIO, .ttl_bits = i_APCI16XX_InsnBitsReadTTLIO, @@ -76,25 +72,8 @@ static int apci16xx_auto_attach(struct comedi_device *dev, if (ret) return ret; - if (!this_board->pc_EepromChip || - strcmp(this_board->pc_EepromChip, ADDIDATA_9054)) { - /* board does not have an eeprom or is not ADDIDATA_9054 */ - if (this_board->i_IorangeBase1) - 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); + dev->iobase = pci_resource_start(pcidev, 0); + devpriv->iobase = dev->iobase; /* Initialize parameters that can be overridden in EEPROM */ devpriv->s_EeParameters.i_NbrAiChannel = this_board->i_NbrAiChannel; @@ -165,12 +144,7 @@ static int apci16xx_auto_attach(struct comedi_device *dev, static void apci16xx_detach(struct comedi_device *dev) { struct pci_dev *pcidev = comedi_to_pci_dev(dev); - struct addi_private *devpriv = dev->private; - if (devpriv) { - if (devpriv->dw_AiBase) - iounmap(devpriv->dw_AiBase); - } if (pcidev) { if (dev->iobase) comedi_pci_disable(pcidev); -- 2.30.2