diff options
| author |   Thierry Reding <treding@nvidia.com> | 2015-12-02 17:30:28 +0100 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2015-12-03 15:14:58 -0500 |
| commit | 8c7d3972fdbe9fb7644edea83e0ca5e771aa5563 (patch) | |
| tree | 1d1f38332a26641db0d0a23a54c7acc5425eefaf /drivers/net/ethernet/freescale/fec_mpc52xx.c | |
| parent | net: bcm63xx: Use platform_register/unregister_drivers() (diff) | |
| download | linux-dev-8c7d3972fdbe9fb7644edea83e0ca5e771aa5563.tar.xz linux-dev-8c7d3972fdbe9fb7644edea83e0ca5e771aa5563.zip | |
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>
Diffstat (limited to 'drivers/net/ethernet/freescale/fec_mpc52xx.c')
| -rw-r--r-- | drivers/net/ethernet/freescale/fec_mpc52xx.c | 22 |
1 files changed, 9 insertions, 13 deletions
diff --git a/drivers/net/ethernet/freescale/fec_mpc52xx.c b/drivers/net/ethernet/freescale/fec_mpc52xx.c index afe7f39cdd7c..25553ee857b4 100644 --- a/drivers/net/ethernet/freescale/fec_mpc52xx.c +++ b/drivers/net/ethernet/freescale/fec_mpc52xx.c @@ -1084,27 +1084,23 @@ static struct platform_driver mpc52xx_fec_driver = { /* Module */ /* ======================================================================== */ +static struct platform_driver * const drivers[] = { +#ifdef CONFIG_FEC_MPC52xx_MDIO + &mpc52xx_fec_mdio_driver, +#endif + &mpc52xx_fec_driver, +}; + static int __init mpc52xx_fec_init(void) { -#ifdef CONFIG_FEC_MPC52xx_MDIO - 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); + return platform_register_drivers(drivers, ARRAY_SIZE(drivers)); } static void __exit mpc52xx_fec_exit(void) { - platform_driver_unregister(&mpc52xx_fec_driver); -#ifdef CONFIG_FEC_MPC52xx_MDIO - platform_driver_unregister(&mpc52xx_fec_mdio_driver); -#endif + platform_unregister_drivers(drivers, ARRAY_SIZE(drivers)); } |