From: H Hartley Sweeten <hsweeten@visionengravers.com>
Date: Wed, 10 Apr 2013 18:27:50 +0000 (-0700)
Subject: staging: comedi: s626: use pci_ioremap_bar()
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=5970b1021dba511850976117e5948fda7be6300e;p=deliverable%2Flinux.git

staging: comedi: s626: 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/s626.c b/drivers/staging/comedi/drivers/s626.c
index b6c7cb980d33..0cf4b3d1279a 100644
--- a/drivers/staging/comedi/drivers/s626.c
+++ b/drivers/staging/comedi/drivers/s626.c
@@ -2599,8 +2599,7 @@ static int s626_auto_attach(struct comedi_device *dev,
 	if (ret)
 		return ret;
 
-	devpriv->mmio = ioremap(pci_resource_start(pcidev, 0),
-				pci_resource_len(pcidev, 0));
+	devpriv->mmio = pci_ioremap_bar(pcidev, 0);
 	if (!devpriv->mmio)
 		return -ENOMEM;