]> git.openfabrics.org - ~shefty/rdma-dev.git/commitdiff
staging: comedi: comedi_pci: dev->board_name is always valid
authorH Hartley Sweeten <hsweeten@visionengravers.com>
Mon, 8 Apr 2013 17:56:20 +0000 (10:56 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 8 Apr 2013 18:39:19 +0000 (11:39 -0700)
The dev->board_name is always initialized before calling the(*attach)
or (*auto_attach) function. It's no longer necessary to validate the
pointer in comedi_pci_enable().

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/comedi/comedi_pci.c

index 6f3cdf88f05ec3a745acd1dd21ffa51f5e85fbc3..5fad084cfbd4dcb0a0a9906d183bb214038c76a3 100644 (file)
@@ -50,9 +50,7 @@ int comedi_pci_enable(struct comedi_device *dev)
        if (rc < 0)
                return rc;
 
-       rc = pci_request_regions(pcidev, dev->board_name
-                                               ? dev->board_name
-                                               : dev->driver->driver_name);
+       rc = pci_request_regions(pcidev, dev->board_name);
        if (rc < 0)
                pci_disable_device(pcidev);
        else