Merge remote-tracking branch 'regulator/topic/wm831x' into regulator-next

2 files changed, 17 insertions, 41 deletions

diff --git a/drivers/regulator/wm831x-dcdc.c b/drivers/regulator/wm831x-dcdc.c
index fb30aeeee32b..5a5bc4bb08d2 100644
--- a/drivers/regulator/wm831x-dcdc.c
+++ b/drivers/regulator/wm831x-dcdc.c
@@ -884,35 +884,22 @@ static struct platform_driver wm831x_epe_driver = {
         },
 };
 
+static struct platform_driver * const drivers[] = {
+        &wm831x_buckv_driver,
+        &wm831x_buckp_driver,
+        &wm831x_boostp_driver,
+        &wm831x_epe_driver,
+};
+
 static int __init wm831x_dcdc_init(void)
 {
-        int ret;
-        ret = platform_driver_register(&wm831x_buckv_driver);
-        if (ret != 0)
-                pr_err("Failed to register WM831x BUCKV driver: %d\n", ret);
-
-        ret = platform_driver_register(&wm831x_buckp_driver);
-        if (ret != 0)
-                pr_err("Failed to register WM831x BUCKP driver: %d\n", ret);
-
-        ret = platform_driver_register(&wm831x_boostp_driver);
-        if (ret != 0)
-                pr_err("Failed to register WM831x BOOST driver: %d\n", ret);
-
-        ret = platform_driver_register(&wm831x_epe_driver);
-        if (ret != 0)
-                pr_err("Failed to register WM831x EPE driver: %d\n", ret);
-
-        return 0;
+        return platform_register_drivers(drivers, ARRAY_SIZE(drivers));
 }
 subsys_initcall(wm831x_dcdc_init);
 
 static void __exit wm831x_dcdc_exit(void)
 {
-        platform_driver_unregister(&wm831x_epe_driver);
-        platform_driver_unregister(&wm831x_boostp_driver);
-        platform_driver_unregister(&wm831x_buckp_driver);
-        platform_driver_unregister(&wm831x_buckv_driver);
+        platform_unregister_drivers(drivers, ARRAY_SIZE(drivers));
 }
 module_exit(wm831x_dcdc_exit);
 
diff --git a/drivers/regulator/wm831x-ldo.c b/drivers/regulator/wm831x-ldo.c
index 18461cf262b4..e4a6f888484e 100644
--- a/drivers/regulator/wm831x-ldo.c
+++ b/drivers/regulator/wm831x-ldo.c
@@ -653,32 +653,21 @@ static struct platform_driver wm831x_alive_ldo_driver = {
         },
 };
 
+static struct platform_driver * const drivers[] = {
+        &wm831x_gp_ldo_driver,
+        &wm831x_aldo_driver,
+        &wm831x_alive_ldo_driver,
+};
+
 static int __init wm831x_ldo_init(void)
 {
-        int ret;
-
-        ret = platform_driver_register(&wm831x_gp_ldo_driver);
-        if (ret != 0)
-                pr_err("Failed to register WM831x GP LDO driver: %d\n", ret);
-
-        ret = platform_driver_register(&wm831x_aldo_driver);
-        if (ret != 0)
-                pr_err("Failed to register WM831x ALDO driver: %d\n", ret);
-
-        ret = platform_driver_register(&wm831x_alive_ldo_driver);
-        if (ret != 0)
-                pr_err("Failed to register WM831x alive LDO driver: %d\n",
-                       ret);
-
-        return 0;
+        return platform_register_drivers(drivers, ARRAY_SIZE(drivers));
 }
 subsys_initcall(wm831x_ldo_init);
 
 static void __exit wm831x_ldo_exit(void)
 {
-        platform_driver_unregister(&wm831x_alive_ldo_driver);
-        platform_driver_unregister(&wm831x_aldo_driver);
-        platform_driver_unregister(&wm831x_gp_ldo_driver);
+        platform_unregister_drivers(drivers, ARRAY_SIZE(drivers));
 }
 module_exit(wm831x_ldo_exit);