diff options
| author | Thierry Reding <treding@nvidia.com> | 2015-12-02 17:30:29 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-12-03 15:14:58 -0500 |
| commit | 3b5dde70b18e2aa05138466cd6b83f6529d4df0d (patch) | |
| tree | 46bb456f266188f411154b4258b471cff59ac6bd | |
| parent | 8c7d3972fdbe9fb7644edea83e0ca5e771aa5563 (diff) | |
| download | op-kernel-dev-3b5dde70b18e2aa05138466cd6b83f6529d4df0d.zip op-kernel-dev-3b5dde70b18e2aa05138466cd6b83f6529d4df0d.tar.gz | |
net: mv643xx: 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>
| -rw-r--r-- | drivers/net/ethernet/marvell/mv643xx_eth.c | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/drivers/net/ethernet/marvell/mv643xx_eth.c b/drivers/net/ethernet/marvell/mv643xx_eth.c index 4182290..4eba2ed 100644 --- a/drivers/net/ethernet/marvell/mv643xx_eth.c +++ b/drivers/net/ethernet/marvell/mv643xx_eth.c @@ -3257,25 +3257,20 @@ static struct platform_driver mv643xx_eth_driver = { }, }; +static struct platform_driver * const drivers[] = { + &mv643xx_eth_shared_driver, + &mv643xx_eth_driver, +}; + static int __init mv643xx_eth_init_module(void) { - int rc; - - rc = platform_driver_register(&mv643xx_eth_shared_driver); - if (!rc) { - rc = platform_driver_register(&mv643xx_eth_driver); - if (rc) - platform_driver_unregister(&mv643xx_eth_shared_driver); - } - - return rc; + return platform_register_drivers(drivers, ARRAY_SIZE(drivers)); } module_init(mv643xx_eth_init_module); static void __exit mv643xx_eth_cleanup_module(void) { - platform_driver_unregister(&mv643xx_eth_driver); - platform_driver_unregister(&mv643xx_eth_shared_driver); + platform_unregister_drivers(drivers, ARRAY_SIZE(drivers)); } module_exit(mv643xx_eth_cleanup_module); |
