From 9262463695666b804803c35deda0ca41bc86bda9 Mon Sep 17 00:00:00 2001
From: H Hartley Sweeten <hsweeten@visionengravers.com>
Date: Wed, 10 Apr 2013 11:28:10 -0700
Subject: [PATCH] --- yaml --- r: 364106 b: refs/heads/master c:
 8b46d7da7f5e869a39b81c3d2193e88b1b52fc99 h: refs/heads/master v: v3

---
 [refs]                                        |  2 +-
 .../staging/comedi/drivers/cb_pcidas64.c      | 19 ++++++-------------
 2 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/[refs] b/[refs]
index 33379f31ea61..a4e4cbc0e31c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5970b1021dba511850976117e5948fda7be6300e
+refs/heads/master: 8b46d7da7f5e869a39b81c3d2193e88b1b52fc99
diff --git a/trunk/drivers/staging/comedi/drivers/cb_pcidas64.c b/trunk/drivers/staging/comedi/drivers/cb_pcidas64.c
index 584fdffa7b61..de5c8faa91d8 100644
--- a/trunk/drivers/staging/comedi/drivers/cb_pcidas64.c
+++ b/trunk/drivers/staging/comedi/drivers/cb_pcidas64.c
@@ -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) {