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 <[email protected]>
Cc: Ian Abbott <[email protected]>
Cc: Greg Kroah-Hartman <[email protected]>
---
 drivers/staging/comedi/drivers/pcl725.c | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/drivers/staging/comedi/drivers/pcl725.c 
b/drivers/staging/comedi/drivers/pcl725.c
index 3cd5e7f..5a2bc67 100644
--- a/drivers/staging/comedi/drivers/pcl725.c
+++ b/drivers/staging/comedi/drivers/pcl725.c
@@ -45,17 +45,11 @@ static int pcl725_di_insn(struct comedi_device *dev, struct 
comedi_subdevice *s,
 static int pcl725_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: pcl725: 0x%04lx ", dev->minor, iobase);
-       if (!request_region(iobase, PCL725_SIZE, "pcl725")) {
-               printk("I/O port conflict\n");
-               return -EIO;
-       }
-       dev->iobase = iobase;
-       dev->irq = 0;
+       ret = comedi_request_region(dev, it->options[0], PCL725_SIZE);
+       if (ret)
+               return ret;
 
        ret = comedi_alloc_subdevices(dev, 2);
        if (ret)
-- 
1.8.1.4

_______________________________________________
devel mailing list
[email protected]
http://driverdev.linuxdriverproject.org/mailman/listinfo/devel

Reply via email to