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

2015-12-03 Thread David Miller
From: Thierry Reding 
Date: Wed,  2 Dec 2015 17:30:27 +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 2/4] net: bcm63xx: 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/broadcom/bcm63xx_enet.c | 28 
 1 file changed, 8 insertions(+), 20 deletions(-)

diff --git a/drivers/net/ethernet/broadcom/bcm63xx_enet.c 
b/drivers/net/ethernet/broadcom/bcm63xx_enet.c
index 8b1929e9f698..a54bafad3538 100644
--- a/drivers/net/ethernet/broadcom/bcm63xx_enet.c
+++ b/drivers/net/ethernet/broadcom/bcm63xx_enet.c
@@ -2884,33 +2884,21 @@ struct platform_driver bcm63xx_enet_shared_driver = {
},
 };
 
+static struct platform_driver * const drivers[] = {
+   _enet_shared_driver,
+   _enet_driver,
+   _enetsw_driver,
+};
+
 /* entry point */
 static int __init bcm_enet_init(void)
 {
-   int ret;
-
-   ret = platform_driver_register(_enet_shared_driver);
-   if (ret)
-   return ret;
-
-   ret = platform_driver_register(_enet_driver);
-   if (ret)
-   platform_driver_unregister(_enet_shared_driver);
-
-   ret = platform_driver_register(_enetsw_driver);
-   if (ret) {
-   platform_driver_unregister(_enet_driver);
-   platform_driver_unregister(_enet_shared_driver);
-   }
-
-   return ret;
+   return platform_register_drivers(drivers, ARRAY_SIZE(drivers));
 }
 
 static void __exit bcm_enet_exit(void)
 {
-   platform_driver_unregister(_enet_driver);
-   platform_driver_unregister(_enetsw_driver);
-   platform_driver_unregister(_enet_shared_driver);
+   platform_unregister_drivers(drivers, ARRAY_SIZE(drivers));
 }
 
 
-- 
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