From: H Hartley Sweeten <hsweeten@visionengravers.com>
Date: Wed, 10 Apr 2013 18:27:13 +0000 (-0700)
Subject: staging: comedi: gsc_hpdi: use pci_ioremap_bar()
X-Git-Tag: v3.10-rc1~192^2~100
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=925fe5a6dca3e6a98c74e543cfb072ec63d58b73;p=~emulex%2Finfiniband.git

staging: comedi: gsc_hpdi: use pci_ioremap_bar()

Use pci_ioremap_bar() to ioremap the PCI resources. That function
just takes the pci device and a bar number. It also has some
additional sanity checks to make sure the bar is actually a
memory resource.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/drivers/staging/comedi/drivers/gsc_hpdi.c b/drivers/staging/comedi/drivers/gsc_hpdi.c
index 4221f262505..0c061df0978 100644
--- a/drivers/staging/comedi/drivers/gsc_hpdi.c
+++ b/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;