Skip to content

Commit

Permalink
staging: comedi: aio_aio12_8: 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  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 044c2e1 commit a595851
Showing 1 changed file with 5 additions and 9 deletions.
14 changes: 5 additions & 9 deletions drivers/staging/comedi/drivers/aio_aio12_8.c
Original file line number Diff line number Diff line change
Expand Up @@ -200,15 +200,11 @@ static int aio_aio12_8_attach(struct comedi_device *dev,
const struct aio12_8_boardtype *board = comedi_board(dev);
struct aio12_8_private *devpriv;
struct comedi_subdevice *s;
int iobase;
int ret;

iobase = it->options[0];
if (!request_region(iobase, 32, dev->board_name)) {
printk(KERN_ERR "I/O port conflict");
return -EIO;
}
dev->iobase = iobase;
ret = comedi_request_region(dev, it->options[0], 32);
if (ret)
return ret;

devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
if (!devpriv)
Expand Down Expand Up @@ -248,8 +244,8 @@ static int aio_aio12_8_attach(struct comedi_device *dev,

s = &dev->subdevices[2];
/* 8255 Digital i/o subdevice */
iobase = dev->iobase + AIO12_8_8255_BASE_REG;
ret = subdev_8255_init(dev, s, NULL, iobase);
ret = subdev_8255_init(dev, s, NULL,
dev->iobase + AIO12_8_8255_BASE_REG);
if (ret)
return ret;

Expand Down

0 comments on commit a595851

Please sign in to comment.