summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-u300/regulator.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm/mach-u300/regulator.c')
-rw-r--r--arch/arm/mach-u300/regulator.c12
1 files changed, 3 insertions, 9 deletions
diff --git a/arch/arm/mach-u300/regulator.c b/arch/arm/mach-u300/regulator.c
index 8a67dc604576..bbda954e00fd 100644
--- a/arch/arm/mach-u300/regulator.c
+++ b/arch/arm/mach-u300/regulator.c
@@ -58,10 +58,7 @@ static int __init __u300_init_boardpower(struct platform_device *pdev)
u32 val;
pr_info("U300: setting up board power\n");
- if (pdev)
- main_power_15 = regulator_get(&pdev->dev, "vana15");
- else
- main_power_15 = regulator_get(NULL, "vana15");
+ main_power_15 = regulator_get(&pdev->dev, "vana15");
if (IS_ERR(main_power_15)) {
pr_err("could not get vana15");
@@ -114,11 +111,8 @@ static struct platform_driver s365_board_driver = {
*/
static int __init u300_init_boardpower(void)
{
- if (of_have_populated_dt())
- return platform_driver_probe(&s365_board_driver,
- s365_board_probe);
- /* Only call this on non-DT boots */
- return __u300_init_boardpower(NULL);
+ return platform_driver_probe(&s365_board_driver,
+ s365_board_probe);
}
device_initcall(u300_init_boardpower);