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

Commit 929de7e3 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

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

parents d5a6ee61 fde7308e

drivers/base/core.c

+1 −7
Original line number Diff line number Diff line
@@ -1116,13 +1116,7 @@ int device_add(struct device *dev) 
	error = dpm_sysfs_add(dev);

	if (error)

		goto DPMError;

	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

+0 −12
Original line number Diff line number Diff line
@@ -162,12 +162,6 @@ void device_pm_move_before(struct device *deva, struct device *devb) 
	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);

}
@@ -182,12 +176,6 @@ void device_pm_move_after(struct device *deva, struct device *devb) 
	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);

}