From 314deacf9a2766202aab75ccaf6fdd3644e07b56 Mon Sep 17 00:00:00 2001
From: H Hartley Sweeten <hsweeten@visionengravers.com>
Date: Tue, 9 Apr 2013 16:13:19 -0700
Subject: [PATCH] --- yaml --- r: 364039 b: refs/heads/master c:
 71827d43421824a11ac50d83b9e212061a84b025 h: refs/heads/master i:   364037:
 b798a1f89f69141149d14fa1628f615b9d4338a8   364035:
 07a0d1932c4e138417053fc4406c3308d422668c   364031:
 c52d921fce9e6bc499f995f5421787cc72701697 v: v3

---
 [refs]                                        |  2 +-
 .../staging/comedi/drivers/amplc_dio200.c     | 26 +++----------------
 2 files changed, 4 insertions(+), 24 deletions(-)

diff --git a/[refs] b/[refs]
index a7505bdf6432..dd1dcad4f437 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9308902f301d628802e40b6c3fbefa11fc9dd9d9
+refs/heads/master: 71827d43421824a11ac50d83b9e212061a84b025
diff --git a/trunk/drivers/staging/comedi/drivers/amplc_dio200.c b/trunk/drivers/staging/comedi/drivers/amplc_dio200.c
index 1d1f2feaeb66..dc35cc9fb081 100644
--- a/trunk/drivers/staging/comedi/drivers/amplc_dio200.c
+++ b/trunk/drivers/staging/comedi/drivers/amplc_dio200.c
@@ -268,44 +268,24 @@ static const struct dio200_board dio200_isa_boards[] = {
 	},
 };
 
-/*
- * This function checks and requests an I/O region, reporting an error
- * if there is a conflict.
- */
-static int
-dio200_request_region(struct comedi_device *dev,
-		      unsigned long from, unsigned long extent)
-{
-	if (!from || !request_region(from, extent, dev->board_name)) {
-		dev_err(dev->class_dev, "I/O port conflict (%#lx,%lu)!\n",
-			from, extent);
-		return -EIO;
-	}
-	return 0;
-}
-
 static int dio200_attach(struct comedi_device *dev, struct comedi_devconfig *it)
 {
 	const struct dio200_board *thisboard = comedi_board(dev);
 	struct dio200_private *devpriv;
-	unsigned long iobase;
 	unsigned int irq;
 	int ret;
 
-	iobase = it->options[0];
 	irq = it->options[1];
-	dev_info(dev->class_dev, "%s: attach %s 0x%lX,%u\n",
-		 dev->driver->driver_name, dev->board_name, iobase, irq);
 
 	devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
 	if (!devpriv)
 		return -ENOMEM;
 	dev->private = devpriv;
 
-	ret = dio200_request_region(dev, iobase, thisboard->mainsize);
-	if (ret < 0)
+	ret = comedi_request_region(dev, it->options[0], thisboard->mainsize);
+	if (ret)
 		return ret;
-	devpriv->io.u.iobase = iobase;
+	devpriv->io.u.iobase = dev->iobase;
 	devpriv->io.regtype = io_regtype;
 	return amplc_dio200_common_attach(dev, irq, 0);
 }