From edd52c2e60045a024ee24cdef3fe2d45d3db496a Mon Sep 17 00:00:00 2001
From: H Hartley Sweeten <hsweeten@visionengravers.com>
Date: Wed, 10 Apr 2013 11:27:13 -0700
Subject: [PATCH] --- yaml --- r: 364103 b: refs/heads/master c:
 925fe5a6dca3e6a98c74e543cfb072ec63d58b73 h: refs/heads/master i:   364101:
 f3ffe1381ec527f1bab6502857cb5cca8d6aa464   364099:
 2801faa1241d45a082a01335588fce48402f3cd7   364095:
 707dbb38bdd865f3b05b2aff02593b7f430e84b9 v: v3

---
 [refs]                                          | 2 +-
 trunk/drivers/staging/comedi/drivers/gsc_hpdi.c | 8 ++------
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index c24115b26739..5f35b86e7d70 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5aa41d4ce4e1fd71e256f938448424b4f28871c4
+refs/heads/master: 925fe5a6dca3e6a98c74e543cfb072ec63d58b73
diff --git a/trunk/drivers/staging/comedi/drivers/gsc_hpdi.c b/trunk/drivers/staging/comedi/drivers/gsc_hpdi.c
index 4221f2625059..0c061df0978c 100644
--- a/trunk/drivers/staging/comedi/drivers/gsc_hpdi.c
+++ b/trunk/drivers/staging/comedi/drivers/gsc_hpdi.c
@@ -498,12 +498,8 @@ static int hpdi_auto_attach(struct comedi_device *dev,
 		return retval;
 	pci_set_master(pcidev);
 
-	devpriv->plx9080_iobase =
-		ioremap(pci_resource_start(pcidev, 0),
-			pci_resource_len(pcidev, 0));
-	devpriv->hpdi_iobase =
-		ioremap(pci_resource_start(pcidev, 2),
-			pci_resource_len(pcidev, 2));
+	devpriv->plx9080_iobase = pci_ioremap_bar(pcidev, 0);
+	devpriv->hpdi_iobase = pci_ioremap_bar(pcidev, 2);
 	if (!devpriv->plx9080_iobase || !devpriv->hpdi_iobase) {
 		dev_warn(dev->class_dev, "failed to remap io memory\n");
 		return -ENOMEM;