From: H Hartley Sweeten <hsweeten@visionengravers.com>
Date: Mon, 8 Apr 2013 17:56:20 +0000 (-0700)
Subject: staging: comedi: comedi_pci: dev->board_name is always valid
X-Git-Tag: v3.10-rc1~192^2~234
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=46c58127ad544fda69cdab377ca4cb304c61202d;p=profile%2Fivi%2Fkernel-x86-ivi.git

staging: comedi: comedi_pci: dev->board_name is always valid

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>
---

diff --git a/drivers/staging/comedi/comedi_pci.c b/drivers/staging/comedi/comedi_pci.c
index 6f3cdf8..5fad084 100644
--- a/drivers/staging/comedi/comedi_pci.c
+++ b/drivers/staging/comedi/comedi_pci.c
@@ -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