Commit 00725787 authored by Magnus Damm's avatar Magnus Damm Committed by Rafael J. Wysocki

PM: Remove device_type suspend()/resume()

This patch removes the legacy callbacks ->suspend() and
->resume() from struct device_type. These callbacks seem
unused, and new code should instead make use of struct
dev_pm_ops.
Signed-off-by: default avatarMagnus Damm <damm@igel.co.jp>
Acked-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: default avatarRafael J. Wysocki <rjw@sisk.pl>
parent fe419535
...@@ -399,9 +399,6 @@ static int device_resume(struct device *dev, pm_message_t state) ...@@ -399,9 +399,6 @@ static int device_resume(struct device *dev, pm_message_t state)
if (dev->type->pm) { if (dev->type->pm) {
pm_dev_dbg(dev, state, "type "); pm_dev_dbg(dev, state, "type ");
error = pm_op(dev, dev->type->pm, state); error = pm_op(dev, dev->type->pm, state);
} else if (dev->type->resume) {
pm_dev_dbg(dev, state, "legacy type ");
error = dev->type->resume(dev);
} }
if (error) if (error)
goto End; goto End;
...@@ -641,10 +638,6 @@ static int device_suspend(struct device *dev, pm_message_t state) ...@@ -641,10 +638,6 @@ static int device_suspend(struct device *dev, pm_message_t state)
if (dev->type->pm) { if (dev->type->pm) {
pm_dev_dbg(dev, state, "type "); pm_dev_dbg(dev, state, "type ");
error = pm_op(dev, dev->type->pm, state); error = pm_op(dev, dev->type->pm, state);
} else if (dev->type->suspend) {
pm_dev_dbg(dev, state, "legacy type ");
error = dev->type->suspend(dev, state);
suspend_report_result(dev->type->suspend, error);
} }
if (error) if (error)
goto End; goto End;
......
...@@ -289,9 +289,6 @@ struct device_type { ...@@ -289,9 +289,6 @@ struct device_type {
int (*uevent)(struct device *dev, struct kobj_uevent_env *env); int (*uevent)(struct device *dev, struct kobj_uevent_env *env);
void (*release)(struct device *dev); void (*release)(struct device *dev);
int (*suspend)(struct device *dev, pm_message_t state);
int (*resume)(struct device *dev);
struct dev_pm_ops *pm; struct dev_pm_ops *pm;
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment