From: H Hartley Sweeten <hsweeten@visionengravers.com>
Date: Wed, 10 Apr 2013 18:31:05 +0000 (-0700)
Subject: staging: comedi: jr3_pci: use pci_ioremap_bar()
X-Git-Tag: v3.10-rc1~192^2~90
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8567a85168ae6bfbf7e566fe9e16d36a1d23fde7;p=profile%2Fivi%2Fkernel-x86-ivi.git

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>
---

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;