Commit a5958514 authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman

staging: comedi: aio_aio12_8: use comedi_request_region()

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: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 044c2e17
...@@ -200,15 +200,11 @@ static int aio_aio12_8_attach(struct comedi_device *dev, ...@@ -200,15 +200,11 @@ static int aio_aio12_8_attach(struct comedi_device *dev,
const struct aio12_8_boardtype *board = comedi_board(dev); const struct aio12_8_boardtype *board = comedi_board(dev);
struct aio12_8_private *devpriv; struct aio12_8_private *devpriv;
struct comedi_subdevice *s; struct comedi_subdevice *s;
int iobase;
int ret; int ret;
iobase = it->options[0]; ret = comedi_request_region(dev, it->options[0], 32);
if (!request_region(iobase, 32, dev->board_name)) { if (ret)
printk(KERN_ERR "I/O port conflict"); return ret;
return -EIO;
}
dev->iobase = iobase;
devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL); devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
if (!devpriv) if (!devpriv)
...@@ -248,8 +244,8 @@ static int aio_aio12_8_attach(struct comedi_device *dev, ...@@ -248,8 +244,8 @@ static int aio_aio12_8_attach(struct comedi_device *dev,
s = &dev->subdevices[2]; s = &dev->subdevices[2];
/* 8255 Digital i/o subdevice */ /* 8255 Digital i/o subdevice */
iobase = dev->iobase + AIO12_8_8255_BASE_REG; ret = subdev_8255_init(dev, s, NULL,
ret = subdev_8255_init(dev, s, NULL, iobase); dev->iobase + AIO12_8_8255_BASE_REG);
if (ret) if (ret)
return ret; return ret;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment