Re: [PATCH 4/4] net: mv643xx: Use platform_register/unregister_drivers()

2015-12-03 Thread David Miller
From: Thierry Reding 
Date: Wed,  2 Dec 2015 17:30:29 +0100

> From: Thierry Reding 
> 
> 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 

Applied.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[PATCH 4/4] net: mv643xx: Use platform_register/unregister_drivers()

2015-12-02 Thread Thierry Reding
From: Thierry Reding 

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 
---
Applies on top of next-20151127.

 drivers/net/ethernet/marvell/mv643xx_eth.c | 19 +++
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/drivers/net/ethernet/marvell/mv643xx_eth.c 
b/drivers/net/ethernet/marvell/mv643xx_eth.c
index 4182290fdbcf..4eba2ed53052 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[] = {
+   _eth_shared_driver,
+   _eth_driver,
+};
+
 static int __init mv643xx_eth_init_module(void)
 {
-   int rc;
-
-   rc = platform_driver_register(_eth_shared_driver);
-   if (!rc) {
-   rc = platform_driver_register(_eth_driver);
-   if (rc)
-   platform_driver_unregister(_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(_eth_driver);
-   platform_driver_unregister(_eth_shared_driver);
+   platform_unregister_drivers(drivers, ARRAY_SIZE(drivers));
 }
 module_exit(mv643xx_eth_cleanup_module);
 
-- 
2.5.0

--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html