Merge remote-tracking branch 'regulator/topic/wm831x' into regulator-next (d3bd4e0a) · Commits · e / devices / android_kernel_teracube_emerald

drivers/regulator/wm831x-dcdc.c

+9 −22

Original line number	Diff line number	Diff line
		@@ -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);

+8 −19

Original line number	Diff line number	Diff line
		@@ -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);