staging: comedi: daqboard2000: 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/daqboard2000.c b/drivers/staging/comedi/drivers/daqboard2000.c
index a0ec8bd5c01d32d725db63bea3f966b9156ae80f..ed3d6e510818ddc66472d88af2cf8696cf1cf839 100644 (file)
--- 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;