[PATCH 18/79] staging: comedi: pcl3730: use comedi_request_region()
H Hartley Sweeten
hsweeten at visionengravers.com
Tue Apr 9 23:12:34 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.
Also, remove the unnecessary 'dev->irq = 0'. This driver does not
use interrupts and the comedi core has already cleared this variable.
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/pcm3730.c | 13 +++----------
1 file changed, 3 insertions(+), 10 deletions(-)
diff --git a/drivers/staging/comedi/drivers/pcm3730.c b/drivers/staging/comedi/drivers/pcm3730.c
index d049194..f82a356 100644
--- a/drivers/staging/comedi/drivers/pcm3730.c
+++ b/drivers/staging/comedi/drivers/pcm3730.c
@@ -54,18 +54,11 @@ static int pcm3730_attach(struct comedi_device *dev,
struct comedi_devconfig *it)
{
struct comedi_subdevice *s;
- unsigned long iobase;
int ret;
- iobase = it->options[0];
- printk(KERN_INFO "comedi%d: pcm3730: 0x%04lx ", dev->minor, iobase);
- if (!request_region(iobase, PCM3730_SIZE, "pcm3730")) {
- printk("I/O port conflict\n");
- return -EIO;
- }
- dev->iobase = iobase;
- dev->iobase = dev->iobase;
- dev->irq = 0;
+ ret = comedi_request_region(dev, it->options[0], PCM3730_SIZE);
+ if (ret)
+ return ret;
ret = comedi_alloc_subdevices(dev, 6);
if (ret)
--
1.8.1.4
More information about the devel
mailing list