staging: comedi: poc: cleanup dev->board_name usage
authorH Hartley Sweeten <hsweeten@visionengravers.com>
Tue, 9 Apr 2013 23:29:29 +0000 (16:29 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 11 Apr 2013 19:47:53 +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/poc.c

index d7842c95d9825bf765757b1b269334d53e30b037..8a34f6f631fd3dee6a50e68beb6e7ea6c5ea2577 100644 (file)
@@ -147,8 +147,6 @@ static int poc_attach(struct comedi_device *dev, struct comedi_devconfig *it)
        printk(KERN_INFO "comedi%d: poc: using %s iobase 0x%lx\n", dev->minor,
               board->name, iobase);
 
-       dev->board_name = board->name;
-
        if (iobase == 0) {
                printk(KERN_ERR "io base address required\n");
                return -EINVAL;
@@ -156,7 +154,7 @@ static int poc_attach(struct comedi_device *dev, struct comedi_devconfig *it)
 
        iosize = board->iosize;
        /* check if io addresses are available */
-       if (!request_region(iobase, iosize, "dac02")) {
+       if (!request_region(iobase, iosize, dev->board_name)) {
                printk(KERN_ERR "I/O port conflict: failed to allocate ports "
                        "0x%lx to 0x%lx\n", iobase, iobase + iosize - 1);
                return -EIO;