diff options
| author | Rafael J. Wysocki <rjw@sisk.pl> | 2009-09-08 23:12:59 +0200 |
|---|---|---|
| committer | Jesse Barnes <jbarnes@virtuousgeek.org> | 2009-09-09 14:19:00 -0700 |
| commit | 5bcc2fb4e8157d829a38093b98e23329ac8acff7 (patch) | |
| tree | 458960ac494d1427ec96cbbfcaa68bd7c0e0b778 /drivers | |
| parent | 748df9a4c65625c386674c9b54dde73de6cc5af5 (diff) | |
| download | op-kernel-dev-5bcc2fb4e8157d829a38093b98e23329ac8acff7.zip op-kernel-dev-5bcc2fb4e8157d829a38093b98e23329ac8acff7.tar.gz | |
PCI PM: Simplify PCI wake-up code
Rework the PCI wake-up code so that it's easier to read without
changing the functionality.
Reviewed-by: Matthew Garrett <mjg59@srcf.ucam.org>
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/pci/pci-acpi.c | 10 | ||||
| -rw-r--r-- | drivers/pci/pci.c | 25 |
2 files changed, 21 insertions, 14 deletions
diff --git a/drivers/pci/pci-acpi.c b/drivers/pci/pci-acpi.c index ea15b05..e798c47 100644 --- a/drivers/pci/pci-acpi.c +++ b/drivers/pci/pci-acpi.c @@ -111,12 +111,16 @@ static bool acpi_pci_can_wakeup(struct pci_dev *dev) static int acpi_pci_sleep_wake(struct pci_dev *dev, bool enable) { - int error = acpi_pm_device_sleep_wake(&dev->dev, enable); + int error; + if (!acpi_pci_can_wakeup(dev)) + return 0; + + error = acpi_pm_device_sleep_wake(&dev->dev, enable); if (!error) - dev_printk(KERN_INFO, &dev->dev, - "wake-up capability %s by ACPI\n", + dev_info(&dev->dev, "wake-up capability %s by ACPI\n", enable ? "enabled" : "disabled"); + return error; } diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c index 8c663d6..84a6d6d 100644 --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c @@ -1220,8 +1220,7 @@ void pci_pme_active(struct pci_dev *dev, bool enable) */ int pci_enable_wake(struct pci_dev *dev, pci_power_t state, bool enable) { - int error = 0; - bool pme_done = false; + int ret = 0; if (enable && !device_may_wakeup(&dev->dev)) return -EINVAL; @@ -1232,18 +1231,22 @@ int pci_enable_wake(struct pci_dev *dev, pci_power_t state, bool enable) * enable. To disable wake-up we call the platform first, for symmetry. */ - if (!enable && platform_pci_can_wakeup(dev)) - error = platform_pci_sleep_wake(dev, false); - - if (!enable || pci_pme_capable(dev, state)) { - pci_pme_active(dev, enable); - pme_done = true; - } + if (enable) { + int error; - if (enable && platform_pci_can_wakeup(dev)) + if (pci_pme_capable(dev, state)) + pci_pme_active(dev, true); + else + ret = 1; error = platform_pci_sleep_wake(dev, true); + if (ret) + ret = error; + } else { + platform_pci_sleep_wake(dev, false); + pci_pme_active(dev, false); + } - return pme_done ? 0 : error; + return ret; } /** |
