summaryrefslogtreecommitdiffstats
path: root/drivers/pci/pci-acpi.c
diff options
context:
space:
mode:
authorRafael J. Wysocki <rjw@sisk.pl>2009-09-08 23:13:49 +0200
committerJesse Barnes <jbarnes@virtuousgeek.org>2009-09-09 23:19:06 +0200
commitdf8db91fc3b543d373afa61beef35b072eea1368 (patch)
tree969c172b1a301e55365668f1e7e6ba0a7e3a0818 /drivers/pci/pci-acpi.c
parentPCI PM: Simplify PCI wake-up code (diff)
downloadlinux-df8db91fc3b543d373afa61beef35b072eea1368.tar.xz
linux-df8db91fc3b543d373afa61beef35b072eea1368.zip
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/pci-acpi.c')
-rw-r--r--drivers/pci/pci-acpi.c13
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)
static int acpi_pci_sleep_wake(struct pci_dev *dev, bool enable)
{
- int error;
-
- if (!acpi_pci_can_wakeup(dev))
- return 0;
-
- error = acpi_pm_device_sleep_wake(&dev->dev, enable);
- if (!error)
- dev_info(&dev->dev, "wake-up capability %s by ACPI\n",
- enable ? "enabled" : "disabled");
-
- return error;
+ return acpi_pci_can_wakeup(dev) ?
+ acpi_pm_device_sleep_wake(&dev->dev, enable) : 0;
}
static struct pci_platform_pm_ops acpi_pci_platform_pm = {