staging: comedi: gsc_hpdi: 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/gsc_hpdi.c b/drivers/staging/comedi/drivers/gsc_hpdi.c
index 4221f26250598fb145eb220be4f5f348832cd55c..0c061df0978cc1fe1aa670bb1049db826444a0b6 100644 (file)
--- a/drivers/staging/comedi/drivers/gsc_hpdi.c
+++ b/drivers/staging/comedi/drivers/gsc_hpdi.c
@@ -498,12 +498,8 @@ static int hpdi_auto_attach(struct comedi_device *dev,
                return retval;
        pci_set_master(pcidev);
 
-       devpriv->plx9080_iobase =
-               ioremap(pci_resource_start(pcidev, 0),
-                       pci_resource_len(pcidev, 0));
-       devpriv->hpdi_iobase =
-               ioremap(pci_resource_start(pcidev, 2),
-                       pci_resource_len(pcidev, 2));
+       devpriv->plx9080_iobase = pci_ioremap_bar(pcidev, 0);
+       devpriv->hpdi_iobase = pci_ioremap_bar(pcidev, 2);
        if (!devpriv->plx9080_iobase || !devpriv->hpdi_iobase) {
                dev_warn(dev->class_dev, "failed to remap io memory\n");
                return -ENOMEM;