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

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: 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 5aa41d4c

drivers/staging/comedi/drivers/gsc_hpdi.c

+2 −6
Original line number Diff line number Diff line
@@ -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;