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>
This commit is contained in:
H Hartley Sweeten 2013-04-10 11:28:28 -07:00 committed by Greg Kroah-Hartman
parent 8b46d7da7f
commit c71b2e52a0

View File

@ -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) {