Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 127420
b: refs/heads/master
c: 07e836e
h: refs/heads/master
v: v3
  • Loading branch information
Rafael J. Wysocki authored and Jesse Barnes committed Jan 7, 2009
1 parent ab38ecd commit a4ade1c
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 571ff7584bb9e05fca0eb79752ae55a46faf3a98
refs/heads/master: 07e836e8d1f3688311d97fe1bf46980b0f9ae9c1
16 changes: 8 additions & 8 deletions trunk/drivers/pci/pci-driver.c
Original file line number Diff line number Diff line change
Expand Up @@ -314,14 +314,6 @@ static void pci_device_shutdown(struct device *dev)

#ifdef CONFIG_PM_SLEEP

static bool pci_has_legacy_pm_support(struct pci_dev *pci_dev)
{
struct pci_driver *drv = pci_dev->driver;

return drv && (drv->suspend || drv->suspend_late || drv->resume
|| drv->resume_early);
}

/*
* Default "suspend" method for devices that have no driver provided suspend,
* or not even a driver at all (first part).
Expand Down Expand Up @@ -458,6 +450,14 @@ static void pci_pm_default_suspend(struct pci_dev *pci_dev)
pci_prepare_to_sleep(pci_dev);
}

static bool pci_has_legacy_pm_support(struct pci_dev *pci_dev)
{
struct pci_driver *drv = pci_dev->driver;

return drv && (drv->suspend || drv->suspend_late || drv->resume
|| drv->resume_early);
}

/* New power management framework */

static int pci_pm_prepare(struct device *dev)
Expand Down

0 comments on commit a4ade1c

Please sign in to comment.