PM / Domains: Check for existing PM domain in dev_pm_domain_attach()

Instead of checking if an existing PM domain pointer has been assigned in
genpd_dev_pm_attach() and acpi_dev_pm_attach(), move the check to the
common path in dev_pm_domain_attach(), thus potentially avoid one
unnecessary check.

Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

3 files changed, 3 insertions, 6 deletions

diff --git a/drivers/acpi/device_pm.c b/drivers/acpi/device_pm.c
index 3d96e4da2d98..d00630016176 100644
--- a/drivers/acpi/device_pm.c
+++ b/drivers/acpi/device_pm.c
@@ -1259,9 +1259,6 @@ int acpi_dev_pm_attach(struct device *dev, bool power_on)
         if (!adev)
                 return -ENODEV;
 
-        if (dev->pm_domain)
-                return -EEXIST;
-
         /*
          * Only attach the power domain to the first device if the
          * companion is shared by multiple. This is to prevent doing power
diff --git a/drivers/base/power/common.c b/drivers/base/power/common.c
index f6a9ad52cbbf..f3cf61f58f25 100644
--- a/drivers/base/power/common.c
+++ b/drivers/base/power/common.c
@@ -104,6 +104,9 @@ int dev_pm_domain_attach(struct device *dev, bool power_on)
 {
         int ret;
 
+        if (dev->pm_domain)
+                return -EEXIST;
+
         ret = acpi_dev_pm_attach(dev, power_on);
         if (ret)
                 ret = genpd_dev_pm_attach(dev);
diff --git a/drivers/base/power/domain.c b/drivers/base/power/domain.c
index d4b96edb027d..b816adbe1e62 100644
--- a/drivers/base/power/domain.c
+++ b/drivers/base/power/domain.c
@@ -2194,9 +2194,6 @@ int genpd_dev_pm_attach(struct device *dev)
         if (!dev->of_node)
                 return -ENODEV;
 
-        if (dev->pm_domain)
-                return -EEXIST;
-
         ret = of_parse_phandle_with_args(dev->of_node, "power-domains",
                                         "#power-domain-cells", 0, &pd_args);
         if (ret < 0)