Commit 21073473 authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman
Browse files

staging: comedi: addi_apci_3xxx: simplify the PCI bar reading 



The boards supported by this driver all have an ADDIDATA_9054 eeprom.
Knowing this we can simplify the code that reads the PCI bars to get
the iobase address used by the driver.

Signed-off-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: default avatarIan Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 98a85621

drivers/staging/comedi/drivers/addi_apci_3xxx.c

+4 −17
Original line number Diff line number Diff line
@@ -718,23 +718,10 @@ static int apci3xxx_auto_attach(struct comedi_device *dev, 
	if (ret)

		return ret;



	if (!board->pc_EepromChip ||

	    strcmp(board->pc_EepromChip, ADDIDATA_9054)) {

		/* board does not have an eeprom or is not ADDIDATA_9054 */

		if (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 = pci_ioremap_bar(pcidev, 3);

	}

	devpriv->i_IobaseReserved = pci_resource_start(pcidev, 3);



	/* Initialize parameters that can be overridden in EEPROM */