]> rtime.felk.cvut.cz Git - sojka/nv-tegra/linux-3.10.git/commitdiff
staging: comedi: jr3_pci: use pci_ioremap_bar()
authorH Hartley Sweeten <hsweeten@visionengravers.com>
Wed, 10 Apr 2013 18:31:05 +0000 (11:31 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 11 Apr 2013 19:54:35 +0000 (12:54 -0700)
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>
drivers/staging/comedi/drivers/jr3_pci.c

index 653c5c3891e1e55ddebcf15e7d309abeadba7be9..90b303ab23000a24d81dd0bed3ba6920e002f778 100644 (file)
@@ -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;