]> git.karo-electronics.de Git - linux-beck.git/commitdiff
staging: comedi: ni_at_ao: use comedi_request_region()
authorH Hartley Sweeten <hsweeten@visionengravers.com>
Tue, 9 Apr 2013 23:33:40 +0000 (16:33 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 11 Apr 2013 19:47:55 +0000 (12:47 -0700)
Use comedi_request_region() to request the I/O region used by this
driver.

Remove the board attach noise 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@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/comedi/drivers/ni_at_ao.c

index be4e1e111480cab4d7442c037fbf79b7165e2f12..4a6eddfbdfd0c660e5faa3bef5fe88678174bdeb 100644 (file)
@@ -337,22 +337,14 @@ static int atao_attach(struct comedi_device *dev, struct comedi_devconfig *it)
        const struct atao_board *board = comedi_board(dev);
        struct atao_private *devpriv;
        struct comedi_subdevice *s;
-       unsigned long iobase;
        int ao_unipolar;
        int ret;
 
-       iobase = it->options[0];
-       if (iobase == 0)
-               iobase = 0x1c0;
        ao_unipolar = it->options[3];
 
-       printk(KERN_INFO "comedi%d: ni_at_ao: 0x%04lx", dev->minor, iobase);
-
-       if (!request_region(iobase, ATAO_SIZE, dev->board_name)) {
-               printk(" I/O port conflict\n");
-               return -EIO;
-       }
-       dev->iobase = iobase;
+       ret = comedi_request_region(dev, it->options[0], ATAO_SIZE);
+       if (ret)
+               return ret;
 
        devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
        if (!devpriv)