Skip to content

Commit

Permalink
staging: comedi: dt2817: use comedi_request_region()
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
H Hartley Sweeten authored and Greg Kroah-Hartman committed Apr 11, 2013
1 parent 19b3da3 commit d6d0299
Showing 1 changed file with 3 additions and 10 deletions.
13 changes: 3 additions & 10 deletions drivers/staging/comedi/drivers/dt2817.c
Original file line number Diff line number Diff line change
Expand Up @@ -126,15 +126,10 @@ static int dt2817_attach(struct comedi_device *dev, struct comedi_devconfig *it)
{
int ret;
struct comedi_subdevice *s;
unsigned long iobase;

iobase = it->options[0];
printk(KERN_INFO "comedi%d: dt2817: 0x%04lx ", dev->minor, iobase);
if (!request_region(iobase, DT2817_SIZE, "dt2817")) {
printk("I/O port conflict\n");
return -EIO;
}
dev->iobase = iobase;
ret = comedi_request_region(dev, it->options[0], DT2817_SIZE);
if (ret)
return ret;

ret = comedi_alloc_subdevices(dev, 1);
if (ret)
Expand All @@ -153,8 +148,6 @@ static int dt2817_attach(struct comedi_device *dev, struct comedi_devconfig *it)
s->state = 0;
outb(0, dev->iobase + DT2817_CR);

printk(KERN_INFO "\n");

return 0;
}

Expand Down

0 comments on commit d6d0299

Please sign in to comment.