commit 04f65062030f157e8b7081b837e3121aeb2162a2
author Ashwini Muduganti <c_amudug@localhost> Fri Sep 22 12:42:50 2017 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Fri Sep 22 15:18:29 2017 -0700
tree 05fa04c46812d7b0c6e92aa5158b3cec608e4a17
parent cfacd692afd89e40bd8d797f0aa1ab00ae5f0fdc

Revert "Revert "drivercore: Avoid adding devices without pm_ops to dpm list""

This reverts commit 6a4f7b3f4653719fa660bfd36f57529246b049a7 due to observed
regression on CXPC on V1 4k & V2.

CRs-Fixed: 2115217
Change-Id: I48502e6116b03d6250041728df172ef8fed6ccfb
Signed-off-by: Ashwini Muduganti <amudug@codeaurora.org>

drivers/base/core.c

diff --git a/drivers/base/core.c b/drivers/base/core.c
index ac43d6f..35ab4d5 100644
--- a/drivers/base/core.c
+++ b/drivers/base/core.c
@@ -1116,7 +1116,13 @@
 	error = dpm_sysfs_add(dev);
 	if (error)
 		goto DPMError;
-	device_pm_add(dev);
+	if ((dev->pm_domain) || (dev->type && dev->type->pm)
+		|| (dev->class && (dev->class->pm || dev->class->resume))
+		|| (dev->bus && (dev->bus->pm || dev->bus->resume)) ||
+		(dev->driver && dev->driver->pm)) {
+		device_pm_add(dev);
+	}
+
 
 	if (MAJOR(dev->devt)) {
 		error = device_create_file(dev, &dev_attr_dev);

drivers/base/power/main.c

diff --git a/drivers/base/power/main.c b/drivers/base/power/main.c
index 4f99101..c1e56c3 100644
--- a/drivers/base/power/main.c
+++ b/drivers/base/power/main.c
@@ -162,6 +162,12 @@
 	pr_debug("PM: Moving %s:%s before %s:%s\n",
 		 deva->bus ? deva->bus->name : "No Bus", dev_name(deva),
 		 devb->bus ? devb->bus->name : "No Bus", dev_name(devb));
+	if (!((devb->pm_domain) || (devb->type && devb->type->pm)
+		|| (devb->class && (devb->class->pm || devb->class->resume))
+		|| (devb->bus && (devb->bus->pm || devb->bus->resume)) ||
+		(devb->driver && devb->driver->pm))) {
+		device_pm_add(devb);
+	}
 	/* Delete deva from dpm_list and reinsert before devb. */
 	list_move_tail(&deva->power.entry, &devb->power.entry);
 }
@@ -176,6 +182,12 @@
 	pr_debug("PM: Moving %s:%s after %s:%s\n",
 		 deva->bus ? deva->bus->name : "No Bus", dev_name(deva),
 		 devb->bus ? devb->bus->name : "No Bus", dev_name(devb));
+	if (!((devb->pm_domain) || (devb->type && devb->type->pm)
+		|| (devb->class && (devb->class->pm || devb->class->resume))
+		|| (devb->bus && (devb->bus->pm || devb->bus->resume)) ||
+		(devb->driver && devb->driver->pm))) {
+		device_pm_add(devb);
+	}
 	/* Delete deva from dpm_list and reinsert after devb. */
 	list_move(&deva->power.entry, &devb->power.entry);
 }