evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

staging: comedi: gsc_hpdi: use pci_ioremap_bar()

Browse source 
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:27:13 -07:00 • committed by Greg Kroah-Hartman
parent 5aa41d4ce4
commit 925fe5a6dc
1 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
drivers/staging/comedi/drivers/gsc_hpdi.c
View file

@ -498,12 +498,8 @@ static int hpdi_auto_attach(struct comedi_device *dev,
return retval; return retval;
pci_set_master(pcidev); pci_set_master(pcidev);
devpriv->plx9080_iobase = devpriv->plx9080_iobase = pci_ioremap_bar(pcidev, 0);
ioremap(pci_resource_start(pcidev, 0), devpriv->hpdi_iobase = pci_ioremap_bar(pcidev, 2);
pci_resource_len(pcidev, 0));
devpriv->hpdi_iobase =
ioremap(pci_resource_start(pcidev, 2),
pci_resource_len(pcidev, 2));
if (!devpriv->plx9080_iobase || !devpriv->hpdi_iobase) { if (!devpriv->plx9080_iobase || !devpriv->hpdi_iobase) {
dev_warn(dev->class_dev, "failed to remap io memory\n"); dev_warn(dev->class_dev, "failed to remap io memory\n");
return -ENOMEM; return -ENOMEM;