From: H Hartley Sweeten <hsweeten@visionengravers.com>
Date: Tue, 26 Mar 2013 21:58:28 +0000 (-0700)
Subject: staging: comedi: rtd520: use pci_ioremap_bar()
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=dde4196ed1133eb0d1d54e138aa281b5bfe74525;p=openwrt%2Fstaging%2Fblogic.git

staging: comedi: rtd520: use pci_ioremap_bar()

Use pci_ioremap_bar() to ioremap the PCI bars used by this driver.

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/rtd520.c b/drivers/staging/comedi/drivers/rtd520.c
index c5ef79e1c5a4..f98ec1467bdd 100644
--- a/drivers/staging/comedi/drivers/rtd520.c
+++ b/drivers/staging/comedi/drivers/rtd520.c
@@ -1287,12 +1287,9 @@ static int rtd_auto_attach(struct comedi_device *dev,
 	if (ret)
 		return ret;
 
-	devpriv->las0 = ioremap_nocache(pci_resource_start(pcidev, 2),
-					pci_resource_len(pcidev, 2));
-	devpriv->las1 = ioremap_nocache(pci_resource_start(pcidev, 3),
-					pci_resource_len(pcidev, 3));
-	devpriv->lcfg = ioremap_nocache(pci_resource_start(pcidev, 0),
-					pci_resource_len(pcidev, 0));
+	devpriv->las0 = pci_ioremap_bar(pcidev, 2);
+	devpriv->las1 = pci_ioremap_bar(pcidev, 3);
+	devpriv->lcfg = pci_ioremap_bar(pcidev, 0);
 	if (!devpriv->las0 || !devpriv->las1 || !devpriv->lcfg)
 		return -ENOMEM;