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

Commit 0d1c744c authored by Thierry Reding's avatar Thierry Reding Committed by David S. Miller
Browse files

net: bcm63xx: Use platform_register/unregister_drivers() 



These new helpers simplify implementing multi-driver modules and
properly handle failure to register one driver by unregistering all
previously registered drivers.

Signed-off-by: default avatarThierry Reding <treding@nvidia.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 36b9ddd5

drivers/net/ethernet/broadcom/bcm63xx_enet.c

+8 −20
Original line number Diff line number Diff line
@@ -2884,33 +2884,21 @@ struct platform_driver bcm63xx_enet_shared_driver = { 
	},

};



static struct platform_driver * const drivers[] = {

	&bcm63xx_enet_shared_driver,

	&bcm63xx_enet_driver,

	&bcm63xx_enetsw_driver,

};



/* entry point */

static int __init bcm_enet_init(void)

{

	int ret;



	ret = platform_driver_register(&bcm63xx_enet_shared_driver);

	if (ret)

		return ret;



	ret = platform_driver_register(&bcm63xx_enet_driver);

	if (ret)

		platform_driver_unregister(&bcm63xx_enet_shared_driver);



	ret = platform_driver_register(&bcm63xx_enetsw_driver);

	if (ret) {

		platform_driver_unregister(&bcm63xx_enet_driver);

		platform_driver_unregister(&bcm63xx_enet_shared_driver);

	}



	return ret;

	return platform_register_drivers(drivers, ARRAY_SIZE(drivers));

}



static void __exit bcm_enet_exit(void)

{

	platform_driver_unregister(&bcm63xx_enet_driver);

	platform_driver_unregister(&bcm63xx_enetsw_driver);

	platform_driver_unregister(&bcm63xx_enet_shared_driver);

	platform_unregister_drivers(drivers, ARRAY_SIZE(drivers));

}