Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit df8db91f authored by Rafael J. Wysocki's avatar Rafael J. Wysocki Committed by Jesse Barnes
Browse files

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: default avatarMatthew Garrett <mjg59@srcf.ucam.org>
Signed-off-by: default avatarRafael J. Wysocki <rjw@sisk.pl>
Signed-off-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
parent 5bcc2fb4

drivers/acpi/sleep.c

+8 −2
Original line number Diff line number Diff line
@@ -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

drivers/pci/pci-acpi.c

+2 −11
Original line number Diff line number Diff line
@@ -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 = {