Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

staging: comedi: addi-data: simplify the PCI bar reading 



All of the remaining addi-data drivers that use the "common" code
either do not have an eeprom or the PCI controller chip is not a
PLX PCI 9054. Knowing this we can simplify the common code that
reads the PCI bars to get the iobase addresses.

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 7e5c304c

drivers/staging/comedi/drivers/addi-data/addi_common.c

+8 −16
Original line number Diff line number Diff line
@@ -98,9 +98,6 @@ static int addi_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
@@ -109,11 +106,6 @@ static int addi_auto_attach(struct comedi_device *dev, 
	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->i_IobaseReserved = pci_resource_start(pcidev, 3);



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

drivers/staging/comedi/drivers/addi-data/addi_common.h

+0 −1
Original line number Diff line number Diff line
@@ -34,7 +34,6 @@ 
#define ADDIDATA_93C76		"93C76"

#define ADDIDATA_S5920		"S5920"

#define ADDIDATA_S5933		"S5933"

#define ADDIDATA_9054		"9054"



/* ADDIDATA Enable Disable */

#define ADDIDATA_ENABLE		1