summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorH Hartley Sweeten <hsweeten@visionengravers.com>2013-04-10 18:31:05 (GMT)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-04-11 19:54:35 (GMT)
commit8567a85168ae6bfbf7e566fe9e16d36a1d23fde7 (patch)
treeef00851bc1eb78531bb48d48d7cfd22756d90b5c
parentcc3750883c161b595be02bf235bd38747a68f0d7 (diff)
downloadlinux-fsl-qoriq-8567a85168ae6bfbf7e566fe9e16d36a1d23fde7.tar.xz
staging: comedi: jr3_pci: 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. This also makes sure that the entire PCI bar is ioremap'ed instead of assuming the size of the bar. 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>
-rw-r--r--drivers/staging/comedi/drivers/jr3_pci.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/staging/comedi/drivers/jr3_pci.c b/drivers/staging/comedi/drivers/jr3_pci.c
index 653c5c3..90b303a 100644
--- a/drivers/staging/comedi/drivers/jr3_pci.c
+++ b/drivers/staging/comedi/drivers/jr3_pci.c
@@ -705,9 +705,7 @@ static int jr3_pci_auto_attach(struct comedi_device *dev,
if (result)
return result;
- devpriv->iobase = ioremap(pci_resource_start(pcidev, 0),
- offsetof(struct jr3_t,
- channel[devpriv->n_channels]));
+ devpriv->iobase = pci_ioremap_bar(pcidev, 0);
if (!devpriv->iobase)
return -ENOMEM;