From: H Hartley Sweeten <hsweeten@visionengravers.com>
Date: Wed, 10 Apr 2013 18:27:33 +0000 (-0700)
Subject: staging: comedi: me_daq: use pci_ioremap_bar()
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=8a38e9a503cd1500cd93c9685c45f300639f0936;p=linux-beck.git

staging: comedi: me_daq: 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/me_daq.c b/drivers/staging/comedi/drivers/me_daq.c
index 5df4f55dbaea..38e38c9abbe7 100644
--- a/drivers/staging/comedi/drivers/me_daq.c
+++ b/drivers/staging/comedi/drivers/me_daq.c
@@ -515,13 +515,11 @@ static int me_auto_attach(struct comedi_device *dev,
 	if (ret)
 		return ret;
 
-	dev_private->plx_regbase = ioremap(pci_resource_start(pcidev, 0),
-					   pci_resource_len(pcidev, 0));
+	dev_private->plx_regbase = pci_ioremap_bar(pcidev, 0);
 	if (!dev_private->plx_regbase)
 		return -ENOMEM;
 
-	dev_private->me_regbase = ioremap(pci_resource_start(pcidev, 2),
-					  pci_resource_len(pcidev, 2));
+	dev_private->me_regbase = pci_ioremap_bar(pcidev, 2);
 	if (!dev_private->me_regbase)
 		return -ENOMEM;