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

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

staging: comedi: daqboard2000: 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 b5fb9e6d

drivers/staging/comedi/drivers/daqboard2000.c

+2 −4
Original line number Diff line number Diff line
@@ -713,10 +713,8 @@ static int daqboard2000_auto_attach(struct comedi_device *dev, 
	if (result)

		return result;



	devpriv->plx = ioremap(pci_resource_start(pcidev, 0),

			       pci_resource_len(pcidev, 0));

	devpriv->daq = ioremap(pci_resource_start(pcidev, 2),

			       pci_resource_len(pcidev, 2));

	devpriv->plx = pci_ioremap_bar(pcidev, 0);

	devpriv->daq = pci_ioremap_bar(pcidev, 2);

	if (!devpriv->plx || !devpriv->daq)

		return -ENOMEM;