[PATCH 67/79] staging: comedi: das16: use __comedi_request_region()

H Hartley Sweeten hsweeten at visionengravers.com
Tue Apr 9 23:30:48 UTC 2013


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 at visionengravers.com>
Cc: Ian Abbott <abbotti at mev.co.uk>
Cc: Greg Kroah-Hartman <gregkh at linuxfoundation.org>
---
 drivers/staging/comedi/drivers/das16.c | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/drivers/staging/comedi/drivers/das16.c b/drivers/staging/comedi/drivers/das16.c
index 01fe078..50902cc 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;
 		}
-- 
1.8.1.4




More information about the devel mailing list