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/daqboard2000.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/drivers/staging/comedi/drivers/daqboard2000.c 
b/drivers/staging/comedi/drivers/daqboard2000.c
index a0ec8bd..ed3d6e5 100644
--- a/drivers/staging/comedi/drivers/daqboard2000.c
+++ b/drivers/staging/comedi/drivers/daqboard2000.c
@@ -713,10 +713,8 @@ static int daqboard2000_auto_attach(struct comedi_device 
*dev,
        if (result)
                return result;
 
-       devpriv->plx = ioremap(pci_resource_start(pcidev, 0),
-                              pci_resource_len(pcidev, 0));
-       devpriv->daq = ioremap(pci_resource_start(pcidev, 2),
-                              pci_resource_len(pcidev, 2));
+       devpriv->plx = pci_ioremap_bar(pcidev, 0);
+       devpriv->daq = pci_ioremap_bar(pcidev, 2);
        if (!devpriv->plx || !devpriv->daq)
                return -ENOMEM;
 
-- 
1.8.1.4

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

Reply via email to