From: H Hartley Sweeten Date: Tue, 9 Apr 2013 23:19:04 +0000 (-0700) Subject: staging: comedi: dt2815: use comedi_request_region() X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=19b3da3e9182a62b9ac378c969b13ea44a202d47;p=deliverable%2Flinux.git staging: comedi: dt2815: 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 Cc: Ian Abbott Cc: Greg Kroah-Hartman Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/comedi/drivers/dt2815.c b/drivers/staging/comedi/drivers/dt2815.c index ad18b1ac8d32..c0eb2e226715 100644 --- a/drivers/staging/comedi/drivers/dt2815.c +++ b/drivers/staging/comedi/drivers/dt2815.c @@ -160,17 +160,11 @@ static int dt2815_attach(struct comedi_device *dev, struct comedi_devconfig *it) struct comedi_subdevice *s; int i; const struct comedi_lrange *current_range_type, *voltage_range_type; - unsigned long iobase; int ret; - iobase = it->options[0]; - printk(KERN_INFO "comedi%d: dt2815: 0x%04lx ", dev->minor, iobase); - if (!request_region(iobase, DT2815_SIZE, "dt2815")) { - printk(KERN_WARNING "I/O port conflict\n"); - return -EIO; - } - - dev->iobase = iobase; + ret = comedi_request_region(dev, it->options[0], DT2815_SIZE); + if (ret) + return ret; ret = comedi_alloc_subdevices(dev, 1); if (ret)