From 4b1f4de5cce3efcd5895bb530d3d93fdaea4d3ee Mon Sep 17 00:00:00 2001
From: H Hartley Sweeten <hsweeten@visionengravers.com>
Date: Tue, 9 Apr 2013 16:29:50 -0700
Subject: [PATCH] --- yaml --- r: 364083 b: refs/heads/master c:
 07e6ed00b15f7c7fd856857e5edf4d890c3a94e9 h: refs/heads/master i:   364081:
 9206e627488d632bb6604fd6d36920bed87ea35a   364079:
 050b4978cde4616a9fe54a50d743cc1d347a817b v: v3

---
 [refs]                                     |  2 +-
 trunk/drivers/staging/comedi/drivers/poc.c | 22 +++-------------------
 2 files changed, 4 insertions(+), 20 deletions(-)

diff --git a/[refs] b/[refs]
index a5fb05bc6475..cc3817855897 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7ba25510ca88bed86e0e1e2537ae914e837afa99
+refs/heads/master: 07e6ed00b15f7c7fd856857e5edf4d890c3a94e9
diff --git a/trunk/drivers/staging/comedi/drivers/poc.c b/trunk/drivers/staging/comedi/drivers/poc.c
index 8a34f6f631fd..e80674e7db9e 100644
--- a/trunk/drivers/staging/comedi/drivers/poc.c
+++ b/trunk/drivers/staging/comedi/drivers/poc.c
@@ -139,27 +139,11 @@ static int poc_attach(struct comedi_device *dev, struct comedi_devconfig *it)
 	const struct boarddef_struct *board = comedi_board(dev);
 	struct poc_private *devpriv;
 	struct comedi_subdevice *s;
-	unsigned long iobase;
-	unsigned int iosize;
 	int ret;
 
-	iobase = it->options[0];
-	printk(KERN_INFO "comedi%d: poc: using %s iobase 0x%lx\n", dev->minor,
-	       board->name, iobase);
-
-	if (iobase == 0) {
-		printk(KERN_ERR "io base address required\n");
-		return -EINVAL;
-	}
-
-	iosize = board->iosize;
-	/* check if io addresses are available */
-	if (!request_region(iobase, iosize, dev->board_name)) {
-		printk(KERN_ERR "I/O port conflict: failed to allocate ports "
-			"0x%lx to 0x%lx\n", iobase, iobase + iosize - 1);
-		return -EIO;
-	}
-	dev->iobase = iobase;
+	ret = comedi_request_region(dev, it->options[0], board->iosize);
+	if (ret)
+		return ret;
 
 	ret = comedi_alloc_subdevices(dev, 1);
 	if (ret)