GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-06-21 14:11:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

PM / core: Drop legacy class suspend/resume operations

Browse source 
There are no classes using the legacy suspend/resume operations in
the tree any more, so drop these operations and update the code
referring to them accordingly.

Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Rafael J. Wysocki 2017-09-25 14:56:44 +02:00
parent e19b205be4
commit a380f2edef
2 changed files with 9 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

20
drivers/base/power/main.c
View file

@ -848,16 +848,10 @@ static int device_resume(struct device *dev, pm_message_t state, bool async)
goto Driver; goto Driver;
} }
if (dev->class) { if (dev->class && dev->class->pm) {
if (dev->class->pm) {
info = "class "; info = "class ";
callback = pm_op(dev->class->pm, state); callback = pm_op(dev->class->pm, state);
goto Driver; goto Driver;
} else if (dev->class->resume) {
info = "legacy class ";
callback = dev->class->resume;
goto End;
}
} }
if (dev->bus) { if (dev->bus) {
@ -1508,17 +1502,10 @@ static int __device_suspend(struct device *dev, pm_message_t state, bool async)
goto Run; goto Run;
} }
if (dev->class) { if (dev->class && dev->class->pm) {
if (dev->class->pm) {
info = "class "; info = "class ";
callback = pm_op(dev->class->pm, state); callback = pm_op(dev->class->pm, state);
goto Run; goto Run;
} else if (dev->class->suspend) {
pm_dev_dbg(dev, state, "legacy class ");
error = legacy_suspend(dev, state, dev->class->suspend,
"legacy class ");
goto End;
}
} }
if (dev->bus) { if (dev->bus) {
@ -1862,8 +1849,7 @@ void device_pm_check_callbacks(struct device *dev)
dev->power.no_pm_callbacks = dev->power.no_pm_callbacks =
(!dev->bus || (pm_ops_is_empty(dev->bus->pm) && (!dev->bus || (pm_ops_is_empty(dev->bus->pm) &&
!dev->bus->suspend && !dev->bus->resume)) && !dev->bus->suspend && !dev->bus->resume)) &&
(!dev->class || (pm_ops_is_empty(dev->class->pm) && (!dev->class || pm_ops_is_empty(dev->class->pm)) &&
!dev->class->suspend && !dev->class->resume)) &&
(!dev->type || pm_ops_is_empty(dev->type->pm)) && (!dev->type || pm_ops_is_empty(dev->type->pm)) &&
(!dev->pm_domain || pm_ops_is_empty(&dev->pm_domain->ops)) && (!dev->pm_domain || pm_ops_is_empty(&dev->pm_domain->ops)) &&
(!dev->driver || (pm_ops_is_empty(dev->driver->pm) && (!dev->driver || (pm_ops_is_empty(dev->driver->pm) &&

5
include/linux/device.h
View file

@ -372,9 +372,6 @@ int subsys_virtual_register(struct bus_type *subsys,
* @devnode: Callback to provide the devtmpfs. * @devnode: Callback to provide the devtmpfs.
* @class_release: Called to release this class. * @class_release: Called to release this class.
* @dev_release: Called to release the device. * @dev_release: Called to release the device.
* @suspend: Used to put the device to sleep mode, usually to a low power
* state.
* @resume: Used to bring the device from the sleep mode.
* @shutdown_pre: Called at shut-down time before driver shutdown. * @shutdown_pre: Called at shut-down time before driver shutdown.
* @ns_type: Callbacks so sysfs can detemine namespaces. * @ns_type: Callbacks so sysfs can detemine namespaces.
* @namespace: Namespace of the device belongs to this class. * @namespace: Namespace of the device belongs to this class.
@ -402,8 +399,6 @@ struct class {
void (*class_release)(struct class *class); void (*class_release)(struct class *class);
void (*dev_release)(struct device *dev); void (*dev_release)(struct device *dev);
int (*suspend)(struct device *dev, pm_message_t state);
int (*resume)(struct device *dev);
int (*shutdown_pre)(struct device *dev); int (*shutdown_pre)(struct device *dev);
const struct kobj_ns_type_operations *ns_type; const struct kobj_ns_type_operations *ns_type;