Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c71b2e52 authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman
Browse files

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: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: default avatarIan Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 8b46d7da

drivers/staging/comedi/drivers/cb_pcidas64.c

+3 −10
Original line number Diff line number Diff line
@@ -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) {