aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/base/power
diff options
context:
space:
mode:
authorMagnus Damm <damm@igel.co.jp>2009-05-24 16:05:54 -0400
committerRafael J. Wysocki <rjw@sisk.pl>2009-06-12 15:32:31 -0400
commite240b58c79144708530138e05f17c6d0d8d744a8 (patch)
treec42553ae8ffb034a767cebb0b4876db3528a2e11 /drivers/base/power
parentd161630297a20802d01c55847bfcba85d2118a9f (diff)
PM: Remove bus_type suspend_late()/resume_early() V2
Remove the ->suspend_late() and ->resume_early() callbacks from struct bus_type V2. These callbacks are legacy stuff at this point and since there seem to be no in-tree users we may as well remove them. New users should use dev_pm_ops. Signed-off-by: Magnus Damm <damm@igel.co.jp> Acked-by: Pavel Machek <pavel@ucw.cz> Acked-by: Greg Kroah-Hartman <gregkh@suse.de> Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Diffstat (limited to 'drivers/base/power')
-rw-r--r--drivers/base/power/main.c7
1 files changed, 0 insertions, 7 deletions
diff --git a/drivers/base/power/main.c b/drivers/base/power/main.c
index 1f3d82260db4..68f9f3cecf7a 100644
--- a/drivers/base/power/main.c
+++ b/drivers/base/power/main.c
@@ -334,9 +334,6 @@ static int device_resume_noirq(struct device *dev, pm_message_t state)
334 if (dev->bus->pm) { 334 if (dev->bus->pm) {
335 pm_dev_dbg(dev, state, "EARLY "); 335 pm_dev_dbg(dev, state, "EARLY ");
336 error = pm_noirq_op(dev, dev->bus->pm, state); 336 error = pm_noirq_op(dev, dev->bus->pm, state);
337 } else if (dev->bus->resume_early) {
338 pm_dev_dbg(dev, state, "legacy EARLY ");
339 error = dev->bus->resume_early(dev);
340 } 337 }
341 End: 338 End:
342 TRACE_RESUME(error); 339 TRACE_RESUME(error);
@@ -581,10 +578,6 @@ static int device_suspend_noirq(struct device *dev, pm_message_t state)
581 if (dev->bus->pm) { 578 if (dev->bus->pm) {
582 pm_dev_dbg(dev, state, "LATE "); 579 pm_dev_dbg(dev, state, "LATE ");
583 error = pm_noirq_op(dev, dev->bus->pm, state); 580 error = pm_noirq_op(dev, dev->bus->pm, state);
584 } else if (dev->bus->suspend_late) {
585 pm_dev_dbg(dev, state, "legacy LATE ");
586 error = dev->bus->suspend_late(dev, state);
587 suspend_report_result(dev->bus->suspend_late, error);
588 } 581 }
589 return error; 582 return error;
590} 583}