summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorH Hartley Sweeten <hsweeten@visionengravers.com>2013-04-10 11:26:34 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-04-11 12:54:34 -0700
commit10e6b5554ac9cc0f3b3951b2aec45451e465f8c3 (patch)
tree2a14d1b4afb428210851ee921c875fc123e29411 /drivers
parentb5fb9e6d23beddf0ead5e2abbc37f7ca30b981bf (diff)
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: H Hartley Sweeten <hsweeten@visionengravers.com> Reviewed-by: Ian Abbott <abbotti@mev.co.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/staging/comedi/drivers/daqboard2000.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/staging/comedi/drivers/daqboard2000.c b/drivers/staging/comedi/drivers/daqboard2000.c
index a0ec8bd5c01d..ed3d6e510818 100644
--- a/drivers/staging/comedi/drivers/daqboard2000.c
+++ b/drivers/staging/comedi/drivers/daqboard2000.c
@@ -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;