]> git.karo-electronics.de Git - linux-beck.git/commitdiff
staging: comedi: ni_atmio16d: cleanup dev->board_name usage
authorH Hartley Sweeten <hsweeten@visionengravers.com>
Tue, 9 Apr 2013 23:25:25 +0000 (16:25 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 11 Apr 2013 19:47:51 +0000 (12:47 -0700)
This legacy driver does no additional probing so the dev->board_name
will already be properly initialized by the comedi core before calling
the (*attach) function.

Remove the unnecessary initialization of dev->board_name and use it
when requesting the resources instead of the open-coded strings.

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_atmio16d.c

index 4a17494f55edc26bd9a371741e667c9e2820d057..faf3c371b3bb4edca76949a2fc9ae60fac692326 100644 (file)
@@ -647,14 +647,12 @@ static int atmio16d_attach(struct comedi_device *dev,
        /* make sure the address range is free and allocate it */
        iobase = it->options[0];
        printk(KERN_INFO "comedi%d: atmio16d: 0x%04lx ", dev->minor, iobase);
-       if (!request_region(iobase, ATMIO16D_SIZE, "ni_atmio16d")) {
+       if (!request_region(iobase, ATMIO16D_SIZE, dev->board_name)) {
                printk("I/O port conflict\n");
                return -EIO;
        }
        dev->iobase = iobase;
 
-       dev->board_name = board->name;
-
        ret = comedi_alloc_subdevices(dev, 4);
        if (ret)
                return ret;