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 <[email protected]>
Cc: Ian Abbott <[email protected]>
Cc: Greg Kroah-Hartman <[email protected]>
---
 drivers/staging/comedi/drivers/me_daq.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/drivers/staging/comedi/drivers/me_daq.c 
b/drivers/staging/comedi/drivers/me_daq.c
index 5df4f55..38e38c9 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;
 
-- 
1.8.1.4

_______________________________________________
devel mailing list
[email protected]
http://driverdev.linuxdriverproject.org/mailman/listinfo/devel

Reply via email to