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

Commit c2f6fabb authored by Bjorn Helgaas's avatar Bjorn Helgaas Committed by Linus Torvalds
Browse files

[PATCH] EISA: tidy-up driver_register() return value 



Remove the assumption that driver_register() returns the number of devices
bound to the driver.  In fact, it returns zero for success or a negative
error value.

Signed-off-by: default avatarBjorn Helgaas <bjorn.helgaas@hp.com>
Acked-by: default avatarJeff Garzik <jgarzik@pobox.com>
Acked-by: default avatarMarc Zyngier <maz@misterjones.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent e51c01b0

drivers/eisa/eisa-bus.c

+1 −6
Original line number Diff line number Diff line
@@ -135,13 +135,8 @@ struct bus_type eisa_bus_type = { 


int eisa_driver_register (struct eisa_driver *edrv)

{

	int r;

	

	edrv->driver.bus = &eisa_bus_type;

	if ((r = driver_register (&edrv->driver)) < 0)

		return r;



	return 0;

	return driver_register (&edrv->driver);

}



void eisa_driver_unregister (struct eisa_driver *edrv)

drivers/net/3c59x.c

+12 −8
Original line number Diff line number Diff line
@@ -1096,13 +1096,17 @@ static int __init vortex_eisa_init (void) 
	int orig_cards_found = vortex_cards_found;



#ifdef CONFIG_EISA

	if (eisa_driver_register (&vortex_eisa_driver) >= 0) {

			/* Because of the way EISA bus is probed, we cannot assume

	int err;



	err = eisa_driver_register (&vortex_eisa_driver);

	if (!err) {

		/*

		 * Because of the way EISA bus is probed, we cannot assume

		 * any device have been found when we exit from

		 * eisa_driver_register (the bus root driver may not be

		 * initialized yet). So we blindly assume something was

			 * found, and let the sysfs magic happend... */

			

		 * found, and let the sysfs magic happend...

		 */

		eisa_found = 1;

	}

#endif

drivers/net/dgrs.c

+7 −7
Original line number Diff line number Diff line
@@ -1551,7 +1551,7 @@ MODULE_PARM_DESC(nicmode, "Digi RightSwitch operating mode (1: switch, 2: multi- 
static int __init dgrs_init_module (void)

{

	int	i;

	int	cardcount = 0;

	int	err;



	/*

	 *	Command line variable overrides
@@ -1593,13 +1593,13 @@ static int __init dgrs_init_module (void) 
	 *	Find and configure all the cards

	 */

#ifdef CONFIG_EISA

	cardcount = eisa_driver_register(&dgrs_eisa_driver);

	if (cardcount < 0)

		return cardcount;

	err = eisa_driver_register(&dgrs_eisa_driver);

	if (err)

		return err;

#endif

	cardcount = pci_register_driver(&dgrs_pci_driver);

	if (cardcount)

		return cardcount;

	err = pci_register_driver(&dgrs_pci_driver);

	if (err)

		return err;

	return 0;

}