summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorH Hartley Sweeten <hsweeten@visionengravers.com>2013-04-09 16:14:33 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-04-11 12:47:38 -0700
commit45f9fcc2ffe8664d3f9a019f150dc11862ab34f4 (patch)
tree8ad476d5a014c9103cd0431005776f86c968b81f
parentfa7533b01c0aa20430e6c1d561bbc4dcef7bfe56 (diff)
staging: comedi: rti802: 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>
-rw-r--r--drivers/staging/comedi/drivers/rti802.c11
1 files changed, 3 insertions, 8 deletions
diff --git a/drivers/staging/comedi/drivers/rti802.c b/drivers/staging/comedi/drivers/rti802.c
index 1440162c8411..8569712dd4b4 100644
--- a/drivers/staging/comedi/drivers/rti802.c
+++ b/drivers/staging/comedi/drivers/rti802.c
@@ -92,16 +92,11 @@ static int rti802_attach(struct comedi_device *dev, struct comedi_devconfig *it)
struct rti802_private *devpriv;
struct comedi_subdevice *s;
int i;
- unsigned long iobase;
int ret;
- iobase = it->options[0];
- printk(KERN_INFO "comedi%d: rti802: 0x%04lx ", dev->minor, iobase);
- if (!request_region(iobase, RTI802_SIZE, "rti802")) {
- printk(KERN_WARNING "I/O port conflict\n");
- return -EIO;
- }
- dev->iobase = iobase;
+ ret = comedi_request_region(dev, it->options[0], RTI802_SIZE);
+ if (ret)
+ return ret;
devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
if (!devpriv)