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

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

staging: comedi: cb_pcidas64: remove the base_address_regions enum 



This enum is only used in the ioremap of the PCI resources and it
doesn't really help make the code any clearer.

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 5970b102

drivers/staging/comedi/drivers/cb_pcidas64.c

+6 −13
Original line number Diff line number Diff line
@@ -118,13 +118,6 @@ static const int max_counter_value = 0xffffff; 


/* PCI-DAS64xxx base addresses */



/* indices of base address regions */

enum base_address_regions {

	PLX9080_BADDRINDEX = 0,

	MAIN_BADDRINDEX = 2,

	DIO_COUNTER_BADDRINDEX = 3,

};



/* devpriv->main_iobase registers */

enum write_only_registers {

	INTR_ENABLE_REG = 0x0,	/*  interrupt enable register */
@@ -4060,24 +4053,24 @@ static int auto_attach(struct comedi_device *dev, 
	/* Initialize dev->board_name */

	dev->board_name = thisboard->name;



	dev->iobase = pci_resource_start(pcidev, MAIN_BADDRINDEX);

	dev->iobase = pci_resource_start(pcidev, 2);



	devpriv->plx9080_phys_iobase =

		pci_resource_start(pcidev, PLX9080_BADDRINDEX);

		pci_resource_start(pcidev, 0);

	devpriv->main_phys_iobase = dev->iobase;

	devpriv->dio_counter_phys_iobase =

		pci_resource_start(pcidev, DIO_COUNTER_BADDRINDEX);

		pci_resource_start(pcidev, 3);



	/*  remap, won't work with 2.0 kernels but who cares */

	devpriv->plx9080_iobase =

		ioremap(devpriv->plx9080_phys_iobase,

			pci_resource_len(pcidev, PLX9080_BADDRINDEX));

			pci_resource_len(pcidev, 0));

	devpriv->main_iobase =

		ioremap(devpriv->main_phys_iobase,

			pci_resource_len(pcidev, MAIN_BADDRINDEX));

			pci_resource_len(pcidev, 2));

	devpriv->dio_counter_iobase =

		ioremap(devpriv->dio_counter_phys_iobase,

			pci_resource_len(pcidev, DIO_COUNTER_BADDRINDEX));

			pci_resource_len(pcidev, 3));



	if (!devpriv->plx9080_iobase || !devpriv->main_iobase

	    || !devpriv->dio_counter_iobase) {