Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 127425
b: refs/heads/master
c: d67e37d
h: refs/heads/master
i:
  127423: 2c11b2a
v: v3
  • Loading branch information
Rafael J. Wysocki authored and Jesse Barnes committed Jan 7, 2009
1 parent 13aecfa commit 04e7069
Show file tree
Hide file tree
Showing 2 changed files with 54 additions and 83 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 98e6e286d7b01deb7453b717aa38ebb69d6cefc0
refs/heads/master: d67e37d7933ba3b28a63ff38c957e433aaca5dc4
135 changes: 53 additions & 82 deletions trunk/drivers/pci/pci-driver.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -486,6 +486,8 @@ static void pci_pm_default_suspend(struct pci_dev *pci_dev)

if (!pci_is_bridge(pci_dev))
pci_prepare_to_sleep(pci_dev);

pci_fixup_device(pci_fixup_suspend, pci_dev);
}

static bool pci_has_legacy_pm_support(struct pci_dev *pci_dev)
Expand Down Expand Up @@ -536,16 +538,13 @@ static int pci_pm_suspend(struct device *dev)
if (pci_has_legacy_pm_support(pci_dev))
return pci_legacy_suspend(dev, PMSG_SUSPEND);

if (drv && drv->pm) {
if (drv->pm->suspend) {
error = drv->pm->suspend(dev);
suspend_report_result(drv->pm->suspend, error);
}
} else {
pci_pm_default_suspend(pci_dev);
if (drv && drv->pm && drv->pm->suspend) {
error = drv->pm->suspend(dev);
suspend_report_result(drv->pm->suspend, error);
}

pci_fixup_device(pci_fixup_suspend, pci_dev);
if (!error)
pci_pm_default_suspend(pci_dev);

return error;
}
Expand All @@ -559,15 +558,14 @@ static int pci_pm_suspend_noirq(struct device *dev)
if (pci_has_legacy_pm_support(pci_dev))
return pci_legacy_suspend_late(dev, PMSG_SUSPEND);

if (drv && drv->pm) {
if (drv->pm->suspend_noirq) {
error = drv->pm->suspend_noirq(dev);
suspend_report_result(drv->pm->suspend_noirq, error);
}
} else {
pci_pm_set_unknown_state(pci_dev);
if (drv && drv->pm && drv->pm->suspend_noirq) {
error = drv->pm->suspend_noirq(dev);
suspend_report_result(drv->pm->suspend_noirq, error);
}

if (!error)
pci_pm_set_unknown_state(pci_dev);

return error;
}

Expand All @@ -580,14 +578,10 @@ static int pci_pm_resume(struct device *dev)
if (pci_has_legacy_pm_support(pci_dev))
return pci_legacy_resume(dev);

if (drv && drv->pm) {
pci_fixup_device(pci_fixup_resume, pci_dev);
error = pci_pm_default_resume(pci_dev);

if (drv->pm->resume)
error = drv->pm->resume(dev);
} else {
error = pci_pm_default_resume(pci_dev);
}
if (!error && drv && drv->pm && drv->pm->resume)
error = drv->pm->resume(dev);

return error;
}
Expand All @@ -601,14 +595,10 @@ static int pci_pm_resume_noirq(struct device *dev)
if (pci_has_legacy_pm_support(pci_dev))
return pci_legacy_resume_early(dev);

if (drv && drv->pm) {
pci_fixup_device(pci_fixup_resume_early, pci_dev);
pci_pm_default_resume_noirq(pci_dev);

if (drv->pm->resume_noirq)
error = drv->pm->resume_noirq(dev);
} else {
pci_pm_default_resume_noirq(pci_dev);
}
if (drv && drv->pm && drv->pm->resume_noirq)
error = drv->pm->resume_noirq(dev);

return error;
}
Expand All @@ -633,15 +623,14 @@ static int pci_pm_freeze(struct device *dev)
if (pci_has_legacy_pm_support(pci_dev))
return pci_legacy_suspend(dev, PMSG_FREEZE);

if (drv && drv->pm) {
if (drv->pm->freeze) {
error = drv->pm->freeze(dev);
suspend_report_result(drv->pm->freeze, error);
}
} else {
pci_pm_default_suspend_generic(pci_dev);
if (drv && drv->pm && drv->pm->freeze) {
error = drv->pm->freeze(dev);
suspend_report_result(drv->pm->freeze, error);
}

if (!error)
pci_pm_default_suspend_generic(pci_dev);

return error;
}

Expand All @@ -654,15 +643,14 @@ static int pci_pm_freeze_noirq(struct device *dev)
if (pci_has_legacy_pm_support(pci_dev))
return pci_legacy_suspend_late(dev, PMSG_FREEZE);

if (drv && drv->pm) {
if (drv->pm->freeze_noirq) {
error = drv->pm->freeze_noirq(dev);
suspend_report_result(drv->pm->freeze_noirq, error);
}
} else {
pci_pm_set_unknown_state(pci_dev);
if (drv && drv->pm && drv->pm->freeze_noirq) {
error = drv->pm->freeze_noirq(dev);
suspend_report_result(drv->pm->freeze_noirq, error);
}

if (!error)
pci_pm_set_unknown_state(pci_dev);

return error;
}

Expand All @@ -675,12 +663,10 @@ static int pci_pm_thaw(struct device *dev)
if (pci_has_legacy_pm_support(pci_dev))
return pci_legacy_resume(dev);

if (drv && drv->pm) {
if (drv->pm->thaw)
error = drv->pm->thaw(dev);
} else {
pci_pm_reenable_device(pci_dev);
}
pci_pm_reenable_device(pci_dev);

if (drv && drv->pm && drv->pm->thaw)
error = drv->pm->thaw(dev);

return error;
}
Expand All @@ -694,12 +680,10 @@ static int pci_pm_thaw_noirq(struct device *dev)
if (pci_has_legacy_pm_support(pci_dev))
return pci_legacy_resume_early(dev);

if (drv && drv->pm) {
if (drv->pm->thaw_noirq)
error = drv->pm->thaw_noirq(dev);
} else {
pci_update_current_state(pci_dev, PCI_D0);
}
pci_update_current_state(pci_dev, PCI_D0);

if (drv && drv->pm && drv->pm->thaw_noirq)
error = drv->pm->thaw_noirq(dev);

return error;
}
Expand All @@ -713,16 +697,13 @@ static int pci_pm_poweroff(struct device *dev)
if (pci_has_legacy_pm_support(pci_dev))
return pci_legacy_suspend(dev, PMSG_HIBERNATE);

if (drv && drv->pm) {
if (drv->pm->poweroff) {
error = drv->pm->poweroff(dev);
suspend_report_result(drv->pm->poweroff, error);
}
} else {
pci_pm_default_suspend(pci_dev);
if (drv && drv->pm && drv->pm->poweroff) {
error = drv->pm->poweroff(dev);
suspend_report_result(drv->pm->poweroff, error);
}

pci_fixup_device(pci_fixup_suspend, pci_dev);
if (!error)
pci_pm_default_suspend(pci_dev);

return error;
}
Expand All @@ -735,11 +716,9 @@ static int pci_pm_poweroff_noirq(struct device *dev)
if (pci_has_legacy_pm_support(to_pci_dev(dev)))
return pci_legacy_suspend_late(dev, PMSG_HIBERNATE);

if (drv && drv->pm) {
if (drv->pm->poweroff_noirq) {
error = drv->pm->poweroff_noirq(dev);
suspend_report_result(drv->pm->poweroff_noirq, error);
}
if (drv && drv->pm && drv->pm->poweroff_noirq) {
error = drv->pm->poweroff_noirq(dev);
suspend_report_result(drv->pm->poweroff_noirq, error);
}

return error;
Expand All @@ -754,14 +733,10 @@ static int pci_pm_restore(struct device *dev)
if (pci_has_legacy_pm_support(pci_dev))
return pci_legacy_resume(dev);

if (drv && drv->pm) {
pci_fixup_device(pci_fixup_resume, pci_dev);
error = pci_pm_default_resume(pci_dev);

if (drv->pm->restore)
error = drv->pm->restore(dev);
} else {
error = pci_pm_default_resume(pci_dev);
}
if (!error && drv && drv->pm && drv->pm->restore)
error = drv->pm->restore(dev);

return error;
}
Expand All @@ -775,14 +750,10 @@ static int pci_pm_restore_noirq(struct device *dev)
if (pci_has_legacy_pm_support(pci_dev))
return pci_legacy_resume_early(dev);

if (drv && drv->pm) {
pci_fixup_device(pci_fixup_resume_early, pci_dev);
pci_pm_default_resume_noirq(pci_dev);

if (drv->pm->restore_noirq)
error = drv->pm->restore_noirq(dev);
} else {
pci_pm_default_resume_noirq(pci_dev);
}
if (drv && drv->pm && drv->pm->restore_noirq)
error = drv->pm->restore_noirq(dev);

return error;
}
Expand Down

0 comments on commit 04e7069

Please sign in to comment.