From 811a77e341899c71834e5a24d92c42f290748e97 Mon Sep 17 00:00:00 2001
From: Ian Abbott <abbotti@mev.co.uk>
Date: Fri, 15 Mar 2013 13:15:36 +0000
Subject: [PATCH] --- yaml --- r: 363511 b: refs/heads/master c:
 84b44d08993ffe762d9a86ee2243239350b871a4 h: refs/heads/master i:   363509:
 5b3d39eb4f20fedeb5715b80bc3ed5b80232b787   363507:
 7b7229ee490b8d5f56fd1395330d72e0b4f90e5d   363503:
 f86f115482a554ba777a42df83395ea561336fc7 v: v3

---
 [refs]                                              | 2 +-
 trunk/drivers/staging/comedi/drivers/cb_pcidas.c    | 1 -
 trunk/drivers/staging/comedi/drivers/daqboard2000.c | 1 -
 trunk/drivers/staging/comedi/drivers/dt3000.c       | 1 -
 trunk/drivers/staging/comedi/drivers/gsc_hpdi.c     | 1 -
 trunk/drivers/staging/comedi/drivers/jr3_pci.c      | 1 -
 trunk/drivers/staging/comedi/drivers/me_daq.c       | 1 -
 trunk/drivers/staging/comedi/drivers/ni_6527.c      | 1 -
 trunk/drivers/staging/comedi/drivers/ni_65xx.c      | 1 -
 trunk/drivers/staging/comedi/drivers/ni_660x.c      | 1 -
 trunk/drivers/staging/comedi/drivers/ni_670x.c      | 1 -
 trunk/drivers/staging/comedi/drivers/ni_labpc.c     | 1 -
 trunk/drivers/staging/comedi/drivers/ni_pcidio.c    | 1 -
 trunk/drivers/staging/comedi/drivers/ni_pcimio.c    | 1 -
 trunk/drivers/staging/comedi/drivers/rtd520.c       | 1 -
 trunk/drivers/staging/comedi/drivers/s626.c         | 1 -
 16 files changed, 1 insertion(+), 16 deletions(-)

diff --git a/[refs] b/[refs]
index d996acaf2ba0..d59893cf6865 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 00ca6884186f18a758eae37e94f7c3c0527f8f30
+refs/heads/master: 84b44d08993ffe762d9a86ee2243239350b871a4
diff --git a/trunk/drivers/staging/comedi/drivers/cb_pcidas.c b/trunk/drivers/staging/comedi/drivers/cb_pcidas.c
index c19e4b2004f8..cdbeb0833d0b 100644
--- a/trunk/drivers/staging/comedi/drivers/cb_pcidas.c
+++ b/trunk/drivers/staging/comedi/drivers/cb_pcidas.c
@@ -1458,7 +1458,6 @@ static int cb_pcidas_auto_attach(struct comedi_device *dev,
 	ret = comedi_pci_enable(dev);
 	if (ret)
 		return ret;
-	dev->iobase = 1;
 
 	devpriv->s5933_config = pci_resource_start(pcidev, 0);
 	devpriv->control_status = pci_resource_start(pcidev, 1);
diff --git a/trunk/drivers/staging/comedi/drivers/daqboard2000.c b/trunk/drivers/staging/comedi/drivers/daqboard2000.c
index 7c549eb442f8..a0ec8bd5c01d 100644
--- a/trunk/drivers/staging/comedi/drivers/daqboard2000.c
+++ b/trunk/drivers/staging/comedi/drivers/daqboard2000.c
@@ -712,7 +712,6 @@ static int daqboard2000_auto_attach(struct comedi_device *dev,
 	result = comedi_pci_enable(dev);
 	if (result)
 		return result;
-	dev->iobase = 1;	/* the "detach" needs this */
 
 	devpriv->plx = ioremap(pci_resource_start(pcidev, 0),
 			       pci_resource_len(pcidev, 0));
diff --git a/trunk/drivers/staging/comedi/drivers/dt3000.c b/trunk/drivers/staging/comedi/drivers/dt3000.c
index edbcd89aff9d..909656ba51b5 100644
--- a/trunk/drivers/staging/comedi/drivers/dt3000.c
+++ b/trunk/drivers/staging/comedi/drivers/dt3000.c
@@ -738,7 +738,6 @@ static int dt3000_auto_attach(struct comedi_device *dev,
 	ret = comedi_pci_enable(dev);
 	if (ret < 0)
 		return ret;
-	dev->iobase = 1;	/* the "detach" needs this */
 
 	pci_base  = pci_resource_start(pcidev, 0);
 	devpriv->io_addr = ioremap(pci_base, DT3000_SIZE);
diff --git a/trunk/drivers/staging/comedi/drivers/gsc_hpdi.c b/trunk/drivers/staging/comedi/drivers/gsc_hpdi.c
index 16b4cc050d35..ba44d0375c20 100644
--- a/trunk/drivers/staging/comedi/drivers/gsc_hpdi.c
+++ b/trunk/drivers/staging/comedi/drivers/gsc_hpdi.c
@@ -502,7 +502,6 @@ static int hpdi_auto_attach(struct comedi_device *dev,
 	retval = comedi_pci_enable(dev);
 	if (retval)
 		return retval;
-	dev->iobase = 1;	/* the "detach" needs this */
 	pci_set_master(pcidev);
 
 	devpriv->plx9080_iobase =
diff --git a/trunk/drivers/staging/comedi/drivers/jr3_pci.c b/trunk/drivers/staging/comedi/drivers/jr3_pci.c
index 36659e500f40..f21ebb536a2d 100644
--- a/trunk/drivers/staging/comedi/drivers/jr3_pci.c
+++ b/trunk/drivers/staging/comedi/drivers/jr3_pci.c
@@ -705,7 +705,6 @@ static int jr3_pci_auto_attach(struct comedi_device *dev,
 	result = comedi_pci_enable(dev);
 	if (result)
 		return result;
-	dev->iobase = 1;	/* the "detach" needs this */
 
 	devpriv->iobase = ioremap(pci_resource_start(pcidev, 0),
 				  offsetof(struct jr3_t,
diff --git a/trunk/drivers/staging/comedi/drivers/me_daq.c b/trunk/drivers/staging/comedi/drivers/me_daq.c
index fbbac1259ebd..5df4f55dbaea 100644
--- a/trunk/drivers/staging/comedi/drivers/me_daq.c
+++ b/trunk/drivers/staging/comedi/drivers/me_daq.c
@@ -514,7 +514,6 @@ static int me_auto_attach(struct comedi_device *dev,
 	ret = comedi_pci_enable(dev);
 	if (ret)
 		return ret;
-	dev->iobase = 1;	/* detach needs this */
 
 	dev_private->plx_regbase = ioremap(pci_resource_start(pcidev, 0),
 					   pci_resource_len(pcidev, 0));
diff --git a/trunk/drivers/staging/comedi/drivers/ni_6527.c b/trunk/drivers/staging/comedi/drivers/ni_6527.c
index 65dd1c68721a..d10f777b7f17 100644
--- a/trunk/drivers/staging/comedi/drivers/ni_6527.c
+++ b/trunk/drivers/staging/comedi/drivers/ni_6527.c
@@ -339,7 +339,6 @@ static int ni6527_auto_attach(struct comedi_device *dev,
 	ret = comedi_pci_enable(dev);
 	if (ret)
 		return ret;
-	dev->iobase = 1;
 
 	devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
 	if (!devpriv)
diff --git a/trunk/drivers/staging/comedi/drivers/ni_65xx.c b/trunk/drivers/staging/comedi/drivers/ni_65xx.c
index eec712e5e138..013392cfe2a1 100644
--- a/trunk/drivers/staging/comedi/drivers/ni_65xx.c
+++ b/trunk/drivers/staging/comedi/drivers/ni_65xx.c
@@ -603,7 +603,6 @@ static int ni_65xx_auto_attach(struct comedi_device *dev,
 	ret = comedi_pci_enable(dev);
 	if (ret)
 		return ret;
-	dev->iobase = 1;
 
 	devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
 	if (!devpriv)
diff --git a/trunk/drivers/staging/comedi/drivers/ni_660x.c b/trunk/drivers/staging/comedi/drivers/ni_660x.c
index 440cfd17ee3a..5cdda7fe97a7 100644
--- a/trunk/drivers/staging/comedi/drivers/ni_660x.c
+++ b/trunk/drivers/staging/comedi/drivers/ni_660x.c
@@ -1180,7 +1180,6 @@ static int ni_660x_auto_attach(struct comedi_device *dev,
 	ret = comedi_pci_enable(dev);
 	if (ret)
 		return ret;
-	dev->iobase = 1;
 
 	ret = ni_660x_allocate_private(dev);
 	if (ret < 0)
diff --git a/trunk/drivers/staging/comedi/drivers/ni_670x.c b/trunk/drivers/staging/comedi/drivers/ni_670x.c
index 524f6cd72687..e9d486238c85 100644
--- a/trunk/drivers/staging/comedi/drivers/ni_670x.c
+++ b/trunk/drivers/staging/comedi/drivers/ni_670x.c
@@ -211,7 +211,6 @@ static int ni_670x_auto_attach(struct comedi_device *dev,
 	ret = comedi_pci_enable(dev);
 	if (ret)
 		return ret;
-	dev->iobase = 1;
 
 	devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
 	if (!devpriv)
diff --git a/trunk/drivers/staging/comedi/drivers/ni_labpc.c b/trunk/drivers/staging/comedi/drivers/ni_labpc.c
index d2edaad4ddbe..62ec39dea97d 100644
--- a/trunk/drivers/staging/comedi/drivers/ni_labpc.c
+++ b/trunk/drivers/staging/comedi/drivers/ni_labpc.c
@@ -711,7 +711,6 @@ static int labpc_auto_attach(struct comedi_device *dev,
 	ret = comedi_pci_enable(dev);
 	if (ret)
 		return ret;
-	dev->iobase = 1;
 
 	devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
 	if (!devpriv)
diff --git a/trunk/drivers/staging/comedi/drivers/ni_pcidio.c b/trunk/drivers/staging/comedi/drivers/ni_pcidio.c
index 3e3a03c49681..b5f340c186ec 100644
--- a/trunk/drivers/staging/comedi/drivers/ni_pcidio.c
+++ b/trunk/drivers/staging/comedi/drivers/ni_pcidio.c
@@ -1115,7 +1115,6 @@ static int nidio_auto_attach(struct comedi_device *dev,
 	ret = comedi_pci_enable(dev);
 	if (ret)
 		return ret;
-	dev->iobase = 1;
 
 	devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
 	if (!devpriv)
diff --git a/trunk/drivers/staging/comedi/drivers/ni_pcimio.c b/trunk/drivers/staging/comedi/drivers/ni_pcimio.c
index 098c398f2bea..bc83df53872e 100644
--- a/trunk/drivers/staging/comedi/drivers/ni_pcimio.c
+++ b/trunk/drivers/staging/comedi/drivers/ni_pcimio.c
@@ -1491,7 +1491,6 @@ static int pcimio_auto_attach(struct comedi_device *dev,
 	ret = comedi_pci_enable(dev);
 	if (ret)
 		return ret;
-	dev->iobase = 1;
 
 	ret = ni_alloc_private(dev);
 	if (ret)
diff --git a/trunk/drivers/staging/comedi/drivers/rtd520.c b/trunk/drivers/staging/comedi/drivers/rtd520.c
index c0935d4a89c1..b1d888eb61f7 100644
--- a/trunk/drivers/staging/comedi/drivers/rtd520.c
+++ b/trunk/drivers/staging/comedi/drivers/rtd520.c
@@ -1286,7 +1286,6 @@ static int rtd_auto_attach(struct comedi_device *dev,
 	ret = comedi_pci_enable(dev);
 	if (ret)
 		return ret;
-	dev->iobase = 1;	/* the "detach" needs this */
 
 	devpriv->las0 = ioremap_nocache(pci_resource_start(pcidev, 2),
 					pci_resource_len(pcidev, 2));
diff --git a/trunk/drivers/staging/comedi/drivers/s626.c b/trunk/drivers/staging/comedi/drivers/s626.c
index d1560524fc14..7d009463b92d 100644
--- a/trunk/drivers/staging/comedi/drivers/s626.c
+++ b/trunk/drivers/staging/comedi/drivers/s626.c
@@ -2676,7 +2676,6 @@ static int s626_auto_attach(struct comedi_device *dev,
 	ret = comedi_pci_enable(dev);
 	if (ret)
 		return ret;
-	dev->iobase = 1;	/* detach needs this */
 
 	devpriv->base_addr = ioremap(pci_resource_start(pcidev, 0),
 				     pci_resource_len(pcidev, 0));