[PATCH 2/2] edac: mv64x60: Use platform_register/unregister_drivers()

[Thierry Reding]

From: Thierry Reding <tred...@nvidia.com>

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 <tred...@nvidia.com>
---
 drivers/edac/mv64x60_edac.c | 39 +++++++++++----------------------------
 1 file changed, 11 insertions(+), 28 deletions(-)

diff --git a/drivers/edac/mv64x60_edac.c b/drivers/edac/mv64x60_edac.c
index 0574e1bbe45c..6c54127e6eae 100644
--- a/drivers/edac/mv64x60_edac.c
+++ b/drivers/edac/mv64x60_edac.c
@@ -847,6 +847,15 @@ static struct platform_driver mv64x60_mc_err_driver = {
        }
 };
 
+static struct platform_driver * const drivers[] = {
+       &mv64x60_mc_err_driver,
+       &mv64x60_cpu_err_driver,
+       &mv64x60_sram_err_driver,
+#ifdef CONFIG_PCI
+       &mv64x60_pci_err_driver,
+#endif
+};
+
 static int __init mv64x60_edac_init(void)
 {
        int ret = 0;
@@ -863,39 +872,13 @@ static int __init mv64x60_edac_init(void)
                break;
        }
 
-       ret = platform_driver_register(&mv64x60_mc_err_driver);
-       if (ret)
-               printk(KERN_WARNING EDAC_MOD_STR "MC err failed to register\n");
-
-       ret = platform_driver_register(&mv64x60_cpu_err_driver);
-       if (ret)
-               printk(KERN_WARNING EDAC_MOD_STR
-                       "CPU err failed to register\n");
-
-       ret = platform_driver_register(&mv64x60_sram_err_driver);
-       if (ret)
-               printk(KERN_WARNING EDAC_MOD_STR
-                       "SRAM err failed to register\n");
-
-#ifdef CONFIG_PCI
-       ret = platform_driver_register(&mv64x60_pci_err_driver);
-       if (ret)
-               printk(KERN_WARNING EDAC_MOD_STR
-                       "PCI err failed to register\n");
-#endif
-
-       return ret;
+       return platform_register_drivers(drivers, ARRAY_SIZE(drivers));
 }
 module_init(mv64x60_edac_init);
 
 static void __exit mv64x60_edac_exit(void)
 {
-#ifdef CONFIG_PCI
-       platform_driver_unregister(&mv64x60_pci_err_driver);
-#endif
-       platform_driver_unregister(&mv64x60_sram_err_driver);
-       platform_driver_unregister(&mv64x60_cpu_err_driver);
-       platform_driver_unregister(&mv64x60_mc_err_driver);
+       platform_unregister_drivers(drivers, ARRAY_SIZE(drivers));
 }
 module_exit(mv64x60_edac_exit);
 
-- 
2.5.0

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/