diff options
author | Rafael J. Wysocki <rjw@sisk.pl> | 2009-09-08 17:13:49 -0400 |
---|---|---|
committer | Jesse Barnes <jbarnes@virtuousgeek.org> | 2009-09-09 17:19:06 -0400 |
commit | df8db91fc3b543d373afa61beef35b072eea1368 (patch) | |
tree | 969c172b1a301e55365668f1e7e6ba0a7e3a0818 /drivers/pci | |
parent | 5bcc2fb4e8157d829a38093b98e23329ac8acff7 (diff) |
PCI / ACPI PM: Rework some debug messages
Move a debug message from acpi_pci_sleep_wake() to
acpi_pm_device_sleep_wake() and use the standard dev_*() macros
in there.
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')
-rw-r--r-- | drivers/pci/pci-acpi.c | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/drivers/pci/pci-acpi.c b/drivers/pci/pci-acpi.c index e798c4736a66..0bddd787490d 100644 --- a/drivers/pci/pci-acpi.c +++ b/drivers/pci/pci-acpi.c | |||
@@ -111,17 +111,8 @@ 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; | 114 | return acpi_pci_can_wakeup(dev) ? |
115 | 115 | acpi_pm_device_sleep_wake(&dev->dev, enable) : 0; | |
116 | if (!acpi_pci_can_wakeup(dev)) | ||
117 | return 0; | ||
118 | |||
119 | error = acpi_pm_device_sleep_wake(&dev->dev, enable); | ||
120 | if (!error) | ||
121 | dev_info(&dev->dev, "wake-up capability %s by ACPI\n", | ||
122 | enable ? "enabled" : "disabled"); | ||
123 | |||
124 | return error; | ||
125 | } | 116 | } |
126 | 117 | ||
127 | static struct pci_platform_pm_ops acpi_pci_platform_pm = { | 118 | static struct pci_platform_pm_ops acpi_pci_platform_pm = { |