Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 37fbb4ac authored by Peter Huewe's avatar Peter Huewe Committed by Greg Kroah-Hartman
Browse files

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: default avatarPeter Huewe <peterhuewe@gmx.de>
Reviewed-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 49d2dbee

drivers/staging/comedi/drivers.c

+0 −4
Original line number Original line Diff line number Diff line
@@ -536,10 +536,6 @@ int comedi_pci_driver_register(struct comedi_driver *comedi_driver, 
	if (ret < 0)

	if (ret < 0)

		return ret;

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

	ret = pci_register_driver(pci_driver);

	if (ret < 0) {

	if (ret < 0) {

		comedi_driver_unregister(comedi_driver);

		comedi_driver_unregister(comedi_driver);