staging: comedi: cb_pcidas64: 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/cb_pcidas64.c b/drivers/staging/comedi/drivers/cb_pcidas64.c
index de5c8faa91d81bebdd9054d63ea98c5e55a4258f..7599053df807627cf6099a02ab96572ae1cece18 100644 (file)
--- a/drivers/staging/comedi/drivers/cb_pcidas64.c
+++ b/drivers/staging/comedi/drivers/cb_pcidas64.c
@@ -4061,16 +4061,9 @@ static int auto_attach(struct comedi_device *dev,
        devpriv->dio_counter_phys_iobase =
                pci_resource_start(pcidev, 3);
 
-       /*  remap, won't work with 2.0 kernels but who cares */
-       devpriv->plx9080_iobase =
-               ioremap(devpriv->plx9080_phys_iobase,
-                       pci_resource_len(pcidev, 0));
-       devpriv->main_iobase =
-               ioremap(devpriv->main_phys_iobase,
-                       pci_resource_len(pcidev, 2));
-       devpriv->dio_counter_iobase =
-               ioremap(devpriv->dio_counter_phys_iobase,
-                       pci_resource_len(pcidev, 3));
+       devpriv->plx9080_iobase = pci_ioremap_bar(pcidev, 0);
+       devpriv->main_iobase = pci_ioremap_bar(pcidev, 2);
+       devpriv->dio_counter_iobase = pci_ioremap_bar(pcidev, 3);
 
        if (!devpriv->plx9080_iobase || !devpriv->main_iobase
            || !devpriv->dio_counter_iobase) {