From: Peter Huewe <peterhuewe@gmx.de>
Date: Mon, 21 Jan 2013 20:51:57 +0000 (+0100)
Subject: staging/comedi: remove workaround for !pci_driver.name
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=37fbb4acda89447b8b37e0cc5d1bd8f7ce9b1bb4;p=linux-beck.git

staging/comedi: remove workaround for !pci_driver.name

All pci drivers in drivers/ have the pci_driver.name field set, so we
can remove this workaround and the accompanying todo.

Signed-off-by: Peter Huewe <peterhuewe@gmx.de>
Reviewed-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/drivers/staging/comedi/drivers.c b/drivers/staging/comedi/drivers.c
index 8b681ac7b31d..cebdd9e8670f 100644
--- a/drivers/staging/comedi/drivers.c
+++ b/drivers/staging/comedi/drivers.c
@@ -536,10 +536,6 @@ int comedi_pci_driver_register(struct comedi_driver *comedi_driver,
 	if (ret < 0)
 		return ret;
 
-	/* FIXME: Remove this test after auditing all comedi pci drivers */
-	if (!pci_driver->name)
-		pci_driver->name = comedi_driver->driver_name;
-
 	ret = pci_register_driver(pci_driver);
 	if (ret < 0) {
 		comedi_driver_unregister(comedi_driver);