[PATCH 46/79] staging: comedi: c6xdigio: use comedi_request_region()
H Hartley Sweeten
hsweeten at visionengravers.com
Tue Apr 9 23:23:11 UTC 2013
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 at visionengravers.com>
Cc: Ian Abbott <abbotti at mev.co.uk>
Cc: Greg Kroah-Hartman <gregkh at linuxfoundation.org>
---
drivers/staging/comedi/drivers/c6xdigio.c | 19 +++++++------------
1 file changed, 7 insertions(+), 12 deletions(-)
diff --git a/drivers/staging/comedi/drivers/c6xdigio.c b/drivers/staging/comedi/drivers/c6xdigio.c
index 2877247..0279e06 100644
--- a/drivers/staging/comedi/drivers/c6xdigio.c
+++ b/drivers/staging/comedi/drivers/c6xdigio.c
@@ -413,21 +413,16 @@ static struct pnp_driver c6xdigio_pnp_driver = {
static int c6xdigio_attach(struct comedi_device *dev,
struct comedi_devconfig *it)
{
- int result = 0;
- unsigned long iobase;
struct comedi_subdevice *s;
+ int ret;
- iobase = it->options[0];
- printk(KERN_DEBUG "comedi%d: c6xdigio: 0x%04lx\n", dev->minor, iobase);
- if (!request_region(iobase, C6XDIGIO_SIZE, "c6xdigio")) {
- printk(KERN_ERR "comedi%d: I/O port conflict\n", dev->minor);
- return -EIO;
- }
- dev->iobase = iobase;
+ ret = comedi_request_region(dev, it->options[0], C6XDIGIO_SIZE);
+ if (ret)
+ return ret;
- result = comedi_alloc_subdevices(dev, 2);
- if (result)
- return result;
+ ret = comedi_alloc_subdevices(dev, 2);
+ if (ret)
+ return ret;
/* Make sure that PnP ports get activated */
pnp_register_driver(&c6xdigio_pnp_driver);
--
1.8.1.4
More information about the devel
mailing list