net: mpc52xx: 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:28 +01:00 committed by David S. Miller
parent 0d1c744cbd
commit 8c7d3972fd
1 changed files with 9 additions and 13 deletions

View File

@ -1084,27 +1084,23 @@ static struct platform_driver mpc52xx_fec_driver = {
/* Module */ /* Module */
/* ======================================================================== */ /* ======================================================================== */
static struct platform_driver * const drivers[] = {
#ifdef CONFIG_FEC_MPC52xx_MDIO
&mpc52xx_fec_mdio_driver,
#endif
&mpc52xx_fec_driver,
};
static int __init static int __init
mpc52xx_fec_init(void) mpc52xx_fec_init(void)
{ {
#ifdef CONFIG_FEC_MPC52xx_MDIO return platform_register_drivers(drivers, ARRAY_SIZE(drivers));
int ret;
ret = platform_driver_register(&mpc52xx_fec_mdio_driver);
if (ret) {
pr_err("failed to register mdio driver\n");
return ret;
}
#endif
return platform_driver_register(&mpc52xx_fec_driver);
} }
static void __exit static void __exit
mpc52xx_fec_exit(void) mpc52xx_fec_exit(void)
{ {
platform_driver_unregister(&mpc52xx_fec_driver); platform_unregister_drivers(drivers, ARRAY_SIZE(drivers));
#ifdef CONFIG_FEC_MPC52xx_MDIO
platform_driver_unregister(&mpc52xx_fec_mdio_driver);
#endif
} }