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/pcl730.c | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/drivers/staging/comedi/drivers/pcl730.c 
b/drivers/staging/comedi/drivers/pcl730.c
index 371f76c..50cc3ac 100644
--- a/drivers/staging/comedi/drivers/pcl730.c
+++ b/drivers/staging/comedi/drivers/pcl730.c
@@ -64,20 +64,11 @@ static int pcl730_attach(struct comedi_device *dev, struct 
comedi_devconfig *it)
 {
        const struct pcl730_board *board = comedi_board(dev);
        struct comedi_subdevice *s;
-       unsigned long iobase;
-       unsigned int iorange;
        int ret;
 
-       iobase = it->options[0];
-       iorange = board->io_range;
-       printk(KERN_INFO "comedi%d: pcl730: board=%s 0x%04lx ", dev->minor,
-              board->name, iobase);
-       if (!request_region(iobase, iorange, dev->board_name)) {
-               printk("I/O port conflict\n");
-               return -EIO;
-       }
-       dev->iobase = iobase;
-       dev->irq = 0;
+       ret = comedi_request_region(dev, it->options[0], board->io_range);
+       if (ret)
+               return ret;
 
        ret = comedi_alloc_subdevices(dev, 4);
        if (ret)
-- 
1.8.1.4

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

Reply via email to