From: H Hartley Sweeten <hsweeten@visionengravers.com>
Date: Tue, 9 Apr 2013 23:30:48 +0000 (-0700)
Subject: staging: comedi: das16: use __comedi_request_region()
X-Git-Tag: v3.10-rc1~192^2~117
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=962e5a36c718678b89939a217eb527c56d9ee8a0;p=~emulex%2Finfiniband.git

staging: comedi: das16: use __comedi_request_region()

Use __comedi_request_region() to request the additional I/O region
used by this driver.

Remove the error message when the request_region() fails,
comedi_request_reqion() will output the error message if necessary.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/drivers/staging/comedi/drivers/das16.c b/drivers/staging/comedi/drivers/das16.c
index 01fe078f391..50902ccb519 100644
--- a/drivers/staging/comedi/drivers/das16.c
+++ b/drivers/staging/comedi/drivers/das16.c
@@ -1120,13 +1120,10 @@ static int das16_attach(struct comedi_device *dev, struct comedi_devconfig *it)
 		if (ret)
 			return ret;
 		/* Request an additional region for the 8255 */
-		if (!request_region(dev->iobase + 0x400, board->size & 0x3ff,
-				    dev->board_name)) {
+		ret = __comedi_request_region(dev, dev->iobase + 0x400,
+					      board->size & 0x3ff);
+		if (ret) {
 			release_region(dev->iobase, 0x10);
-			dev_warn(dev->class_dev,
-				 "%s: I/O port conflict (%#lx,%d)\n",
-				 dev->board_name,
-				 dev->iobase + 0x400, board->size & 0x3ff);
 			dev->iobase = 0;
 			return -EIO;
 		}