summaryrefslogtreecommitdiffstats
path: root/drivers
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 14:19:06 -0700
commitdf8db91fc3b543d373afa61beef35b072eea1368 (patch)
tree969c172b1a301e55365668f1e7e6ba0a7e3a0818 /drivers
parent5bcc2fb4e8157d829a38093b98e23329ac8acff7 (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')
-rw-r--r--drivers/acpi/sleep.c10
-rw-r--r--drivers/pci/pci-acpi.c13
2 files changed, 10 insertions, 13 deletions
diff --git a/drivers/acpi/sleep.c b/drivers/acpi/sleep.c
index 42159a28f43..ab889becd3f 100644
--- a/drivers/acpi/sleep.c
+++ b/drivers/acpi/sleep.c
@@ -689,19 +689,25 @@ int acpi_pm_device_sleep_wake(struct device *dev, bool enable)
{
acpi_handle handle;
struct acpi_device *adev;
+ int error;
if (!device_may_wakeup(dev))
return -EINVAL;
handle = DEVICE_ACPI_HANDLE(dev);
if (!handle || ACPI_FAILURE(acpi_bus_get_device(handle, &adev))) {
- printk(KERN_DEBUG "ACPI handle has no context!\n");
+ dev_dbg(dev, "ACPI handle has no context in %s!\n", __func__);
return -ENODEV;
}
- return enable ?
+ error = enable ?
acpi_enable_wakeup_device_power(adev, acpi_target_sleep_state) :
acpi_disable_wakeup_device_power(adev);
+ if (!error)
+ dev_info(dev, "wake-up capability %s by ACPI\n",
+ enable ? "enabled" : "disabled");
+
+ return error;
}
#endif
diff --git a/drivers/pci/pci-acpi.c b/drivers/pci/pci-acpi.c
index e798c4736a6..0bddd787490 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 = {