From 1cba4aa9b7ed46b1bad05baa0a7c214a685bb3a2 Mon Sep 17 00:00:00 2001
From: H Hartley Sweeten <hsweeten@visionengravers.com>
Date: Wed, 10 Apr 2013 11:30:28 -0700
Subject: [PATCH] --- yaml --- r: 364111 b: refs/heads/master c:
 b153c68dce2a213b964505757518405af1372498 h: refs/heads/master i:   364109:
 6fff79f6931139de120d39bcf5d5c2c0991aeb41   364107:
 54043327847a863c99ad042c8b8d91b0b54107b9   364103:
 edd52c2e60045a024ee24cdef3fe2d45d3db496a   364095:
 707dbb38bdd865f3b05b2aff02593b7f430e84b9 v: v3

---
 [refs]                                           | 2 +-
 trunk/drivers/staging/comedi/drivers/icp_multi.c | 7 +------
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 9cef907903b4..cbd49e998665 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 43535526367196d7dcf11f563b0e418b1efe00fd
+refs/heads/master: b153c68dce2a213b964505757518405af1372498
diff --git a/trunk/drivers/staging/comedi/drivers/icp_multi.c b/trunk/drivers/staging/comedi/drivers/icp_multi.c
index 2bd916e4bfe8..08ab9d6e7190 100644
--- a/trunk/drivers/staging/comedi/drivers/icp_multi.c
+++ b/trunk/drivers/staging/comedi/drivers/icp_multi.c
@@ -68,8 +68,6 @@ Configuration options: not applicable, uses PCI auto config
 #define ICP_MULTI_CNTR2		0x14	/* R/W: Counter 2 */
 #define ICP_MULTI_CNTR3		0x16	/* R/W: Counter 3 */
 
-#define ICP_MULTI_SIZE		0x20	/* 32 bytes */
-
 /*  Define bits from ADC command/status register */
 #define	ADC_ST		0x0001	/* Start ADC */
 #define	ADC_BSY		0x0001	/* ADC busy */
@@ -500,7 +498,6 @@ static int icp_multi_auto_attach(struct comedi_device *dev,
 	struct pci_dev *pcidev = comedi_to_pci_dev(dev);
 	struct icp_multi_private *devpriv;
 	struct comedi_subdevice *s;
-	resource_size_t iobase;
 	int ret;
 
 	devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
@@ -511,10 +508,8 @@ static int icp_multi_auto_attach(struct comedi_device *dev,
 	ret = comedi_pci_enable(dev);
 	if (ret)
 		return ret;
-	iobase = pci_resource_start(pcidev, 2);
-	dev->iobase = iobase;
 
-	devpriv->io_addr = ioremap(iobase, ICP_MULTI_SIZE);
+	devpriv->io_addr = pci_ioremap_bar(pcidev, 2);
 	if (!devpriv->io_addr)
 		return -ENOMEM;