openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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: Thierry Reding <treding@nvidia.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Thierry Reding 2015-12-02 17:30:27 +01:00 committed by David S. Miller
parent 36b9ddd535
commit 0d1c744cbd
1 changed files with 8 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
drivers/net/ethernet/broadcom/bcm63xx_enet.c
View File

@ -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 */ /* entry point */
static int __init bcm_enet_init(void) static int __init bcm_enet_init(void)
{ {
int ret; return platform_register_drivers(drivers, ARRAY_SIZE(drivers));
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;
} }
static void __exit bcm_enet_exit(void) static void __exit bcm_enet_exit(void)
{ {
platform_driver_unregister(&bcm63xx_enet_driver); platform_unregister_drivers(drivers, ARRAY_SIZE(drivers));
platform_driver_unregister(&bcm63xx_enetsw_driver);
platform_driver_unregister(&bcm63xx_enet_shared_driver);
} }