staging: comedi: me_daq: 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/me_daq.c b/drivers/staging/comedi/drivers/me_daq.c
index 5df4f55dbaead65fe476e98c2c71d6c54edfa753..38e38c9abbe76e5c093c3f24a6468c945e9d75cb 100644 (file)
--- 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;