diff options
author | H Hartley Sweeten <hsweeten@visionengravers.com> | 2013-04-09 19:16:18 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-04-11 15:47:39 -0400 |
commit | 5c7fa612f48bfdaff2b655111bf46e5636b4f687 (patch) | |
tree | 8997d8f27af7a2119c307bf9c29d4fa5f8424552 /drivers/staging | |
parent | 7c0bad23e5d7011d1d350080fcbda4bec525521d (diff) |
staging: comedi: das800: use comedi_request_region()
Use comedi_request_region() to request the I/O region used by this
driver.
Remove the noise when the board is first attached as well as 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>
Diffstat (limited to 'drivers/staging')
-rw-r--r-- | drivers/staging/comedi/drivers/das800.c | 20 |
1 files changed, 3 insertions, 17 deletions
diff --git a/drivers/staging/comedi/drivers/das800.c b/drivers/staging/comedi/drivers/das800.c index 14975f8e5b49..d56584d171c8 100644 --- a/drivers/staging/comedi/drivers/das800.c +++ b/drivers/staging/comedi/drivers/das800.c | |||
@@ -437,33 +437,19 @@ static int das800_attach(struct comedi_device *dev, struct comedi_devconfig *it) | |||
437 | const struct das800_board *thisboard = comedi_board(dev); | 437 | const struct das800_board *thisboard = comedi_board(dev); |
438 | struct das800_private *devpriv; | 438 | struct das800_private *devpriv; |
439 | struct comedi_subdevice *s; | 439 | struct comedi_subdevice *s; |
440 | unsigned long iobase = it->options[0]; | ||
441 | unsigned int irq = it->options[1]; | 440 | unsigned int irq = it->options[1]; |
442 | unsigned long irq_flags; | 441 | unsigned long irq_flags; |
443 | int board; | 442 | int board; |
444 | int ret; | 443 | int ret; |
445 | 444 | ||
446 | dev_info(dev->class_dev, "das800: io 0x%lx\n", iobase); | ||
447 | if (irq) | ||
448 | dev_dbg(dev->class_dev, "irq %u\n", irq); | ||
449 | |||
450 | devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL); | 445 | devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL); |
451 | if (!devpriv) | 446 | if (!devpriv) |
452 | return -ENOMEM; | 447 | return -ENOMEM; |
453 | dev->private = devpriv; | 448 | dev->private = devpriv; |
454 | 449 | ||
455 | if (iobase == 0) { | 450 | ret = comedi_request_region(dev, it->options[0], DAS800_SIZE); |
456 | dev_err(dev->class_dev, | 451 | if (ret) |
457 | "io base address required for das800\n"); | 452 | return ret; |
458 | return -EINVAL; | ||
459 | } | ||
460 | |||
461 | /* check if io addresses are available */ | ||
462 | if (!request_region(iobase, DAS800_SIZE, "das800")) { | ||
463 | dev_err(dev->class_dev, "I/O port conflict\n"); | ||
464 | return -EIO; | ||
465 | } | ||
466 | dev->iobase = iobase; | ||
467 | 453 | ||
468 | board = das800_probe(dev); | 454 | board = das800_probe(dev); |
469 | if (board < 0) { | 455 | if (board < 0) { |