---

yaml --- r: 364109 b: refs/heads/master c: 55d2a20 h: refs/heads/master i: 364107: 5404332 v: v3
git-mirror · Apr 11, 2013 · 6fff79f · 6fff79f
1 parent c0ec8b8
commit 6fff79f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 81d985a11e9a51eb88ddea98df8d60bfdda7cafb
+refs/heads/master: 55d2a208923e655d3453b66676f957b0d60be108
diff --git a/trunk/drivers/staging/comedi/drivers/dt3000.c b/trunk/drivers/staging/comedi/drivers/dt3000.c
@@ -165,8 +165,6 @@ static const struct dt3k_boardtype dt3k_boardtypes[] = {
 	},
 };
 
-#define DT3000_SIZE		(4*0x1000)
-
 /* dual-ported RAM location definitions */
 
 #define DPR_DAC_buffer		(4*0x000)
@@ -720,7 +718,6 @@ static int dt3000_auto_attach(struct comedi_device *dev,
 	const struct dt3k_boardtype *this_board = NULL;
 	struct dt3k_private *devpriv;
 	struct comedi_subdevice *s;
-	resource_size_t pci_base;
 	int ret = 0;
 
 	if (context < ARRAY_SIZE(dt3k_boardtypes))
@@ -739,8 +736,7 @@ static int dt3000_auto_attach(struct comedi_device *dev,
 	if (ret < 0)
 		return ret;
 
-	pci_base  = pci_resource_start(pcidev, 0);
-	devpriv->io_addr = ioremap(pci_base, DT3000_SIZE);
+	devpriv->io_addr = pci_ioremap_bar(pcidev, 0);
 	if (!devpriv->io_addr)
 		return -ENOMEM;