diff options
| author | Mark Brown <broonie@kernel.org> | 2016-01-12 18:26:12 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2016-01-12 18:26:12 +0000 |
| commit | d3bd4e0a5fd40ae61fe0dc19f2cfa88c88bb761c (patch) | |
| tree | 9647e61c8aa2def829d7f780578d13ffddaff112 /drivers/regulator/wm831x-ldo.c | |
| parent | 78ae90255276d2cb9e4410df74b378cb9f8a8bbb (diff) | |
| parent | 92a513b79f942dd86f906512352e2c6d7eca1d8b (diff) | |
| download | linux-stable-d3bd4e0a5fd40ae61fe0dc19f2cfa88c88bb761c.tar.gz linux-stable-d3bd4e0a5fd40ae61fe0dc19f2cfa88c88bb761c.tar.bz2 linux-stable-d3bd4e0a5fd40ae61fe0dc19f2cfa88c88bb761c.zip | |
Merge remote-tracking branch 'regulator/topic/wm831x' into regulator-next
Diffstat (limited to 'drivers/regulator/wm831x-ldo.c')
| -rw-r--r-- | drivers/regulator/wm831x-ldo.c | 27 |
1 files changed, 8 insertions, 19 deletions
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); |