---

yaml --- r: 324660 b: refs/heads/master c: fb8ff5d h: refs/heads/master v: v3
git-mirror · Sep 4, 2012 · 487f6ff · 487f6ff
1 parent c27657e
commit 487f6ff
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 8 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9fcd4853f7c642cda6d5d84ba2236d0af7c38336
+refs/heads/master: fb8ff5d501e8b461d604db941673efbc7dc9d347
diff --git a/trunk/drivers/staging/comedi/drivers/das08.c b/trunk/drivers/staging/comedi/drivers/das08.c
@@ -749,7 +749,6 @@ static int das08_pci_attach_common(struct comedi_device *dev,
 				   struct pci_dev *pdev)
 {
 	unsigned long iobase;
-	unsigned long pci_iobase;
 	struct das08_private_struct *devpriv = dev->private;
 
 	if (!IS_ENABLED(CONFIG_COMEDI_DAS08_PCI))
@@ -763,11 +762,8 @@ static int das08_pci_attach_common(struct comedi_device *dev,
 		return -EIO;
 	}
 	/*  read base addresses */
-	pci_iobase = pci_resource_start(pdev, 1);
 	iobase = pci_resource_start(pdev, 2);
-	dev_info(dev->class_dev, "pcibase 0x%lx  iobase 0x%lx\n",
-		 pci_iobase, iobase);
-	devpriv->pci_iobase = pci_iobase;
+	dev_info(dev->class_dev, "iobase 0x%lx\n", iobase);
 	return das08_common_attach(dev, iobase);
 }
 
@@ -914,7 +910,7 @@ static void __maybe_unused das08_detach(struct comedi_device *dev)
 	} else if (IS_ENABLED(CONFIG_COMEDI_DAS08_PCI) &&
 		   thisboard->bustype == pci) {
 		if (devpriv && devpriv->pdev) {
-			if (devpriv->pci_iobase)
+			if (dev->iobase)
 				comedi_pci_disable(devpriv->pdev);
 			pci_dev_put(devpriv->pdev);
 		}

diff --git a/trunk/drivers/staging/comedi/drivers/das08.h b/trunk/drivers/staging/comedi/drivers/das08.h
@@ -52,7 +52,6 @@ struct das08_private_struct {
 	unsigned int do_bits;	/*  bits for do register on boards with register dedicated to digital out only */
 	const unsigned int *pg_gainlist;
 	struct pci_dev *pdev;	/*  struct for pci-das08 */
-	unsigned int pci_iobase;	/*  additional base address for pci-das08 */
 	unsigned int i8254_iobase;
 };