Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4f688748 authored by Ulf Hansson's avatar Ulf Hansson Committed by Rafael J. Wysocki
Browse files

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: default avatarUlf Hansson <ulf.hansson@linaro.org>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent b56d9c91

drivers/acpi/device_pm.c

+0 −3
Original line number Diff line number Diff line
@@ -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

drivers/base/power/common.c

+3 −0
Original line number Diff line number Diff line
@@ -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);

drivers/base/power/domain.c

+0 −3
Original line number Diff line number Diff line
@@ -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)