diff options
author | Rafael J. Wysocki <rjw@sisk.pl> | 2009-09-08 17:12:59 -0400 |
---|---|---|
committer | Jesse Barnes <jbarnes@virtuousgeek.org> | 2009-09-09 17:19:00 -0400 |
commit | 5bcc2fb4e8157d829a38093b98e23329ac8acff7 (patch) | |
tree | 458960ac494d1427ec96cbbfcaa68bd7c0e0b778 /drivers/pci/pci-acpi.c | |
parent | 748df9a4c65625c386674c9b54dde73de6cc5af5 (diff) |
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/pci/pci-acpi.c')
-rw-r--r-- | drivers/pci/pci-acpi.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/drivers/pci/pci-acpi.c b/drivers/pci/pci-acpi.c index ea15b0537457..e798c4736a66 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) | |||
111 | 111 | ||
112 | static int acpi_pci_sleep_wake(struct pci_dev *dev, bool enable) | 112 | static int acpi_pci_sleep_wake(struct pci_dev *dev, bool enable) |
113 | { | 113 | { |
114 | int error = acpi_pm_device_sleep_wake(&dev->dev, enable); | 114 | int error; |
115 | 115 | ||
116 | if (!acpi_pci_can_wakeup(dev)) | ||
117 | return 0; | ||
118 | |||
119 | error = acpi_pm_device_sleep_wake(&dev->dev, enable); | ||
116 | if (!error) | 120 | if (!error) |
117 | dev_printk(KERN_INFO, &dev->dev, | 121 | dev_info(&dev->dev, "wake-up capability %s by ACPI\n", |
118 | "wake-up capability %s by ACPI\n", | ||
119 | enable ? "enabled" : "disabled"); | 122 | enable ? "enabled" : "disabled"); |
123 | |||
120 | return error; | 124 | return error; |
121 | } | 125 | } |
122 | 126 | ||