From: Peng Fan <peng.fan@nxp.com>
Date: Tue, 17 Sep 2019 09:29:22 +0000 (+0000)
Subject: core: device: use dev_power_domain_on
X-Git-Tag: v2020.01-rc1~20^2~16
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=f0cc4eae9a1702a768817ea25d9f23cece69d021;p=oweals%2Fu-boot.git

core: device: use dev_power_domain_on

When multiple power domains attached to a device, need power on
them all, so use dev_power_domain_on to do that.

Signed-off-by: Peng Fan <peng.fan@nxp.com>
---

diff --git a/drivers/core/device.c b/drivers/core/device.c
index 24b940eac2..28363ff00b 100644
--- a/drivers/core/device.c
+++ b/drivers/core/device.c
@@ -312,7 +312,6 @@ static void *alloc_priv(int size, uint flags)
 
 int device_probe(struct udevice *dev)
 {
-	struct power_domain pd;
 	const struct driver *drv;
 	int size = 0;
 	int ret;
@@ -395,8 +394,9 @@ int device_probe(struct udevice *dev)
 
 	if (CONFIG_IS_ENABLED(POWER_DOMAIN) && dev->parent &&
 	    device_get_uclass_id(dev) != UCLASS_POWER_DOMAIN) {
-		if (!power_domain_get(dev, &pd))
-			power_domain_on(&pd);
+		ret = dev_power_domain_on(dev);
+		if (ret)
+			goto fail;
 	}
 
 	ret = uclass_pre_probe_device(dev);