diff options
| author | Mark Brown <broonie@kernel.org> | 2016-01-12 19:26:12 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2016-01-12 19:26:12 +0100 |
| commit | d3bd4e0a5fd40ae61fe0dc19f2cfa88c88bb761c (patch) | |
| tree | 9647e61c8aa2def829d7f780578d13ffddaff112 /drivers/regulator/wm831x-dcdc.c | |
| parent | Merge remote-tracking branches 'regulator/topic/pv88090', 'regulator/topic/qc... (diff) | |
| parent | regulator: wm831x-ldo: Use platform_register/unregister_drivers() (diff) | |
| download | linux-d3bd4e0a5fd40ae61fe0dc19f2cfa88c88bb761c.tar.xz linux-d3bd4e0a5fd40ae61fe0dc19f2cfa88c88bb761c.zip | |
Merge remote-tracking branch 'regulator/topic/wm831x' into regulator-next
Diffstat (limited to 'drivers/regulator/wm831x-dcdc.c')
| -rw-r--r-- | drivers/regulator/wm831x-dcdc.c | 31 |
1 files changed, 9 insertions, 22 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); |