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

Commit 78f5f023 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki Committed by Len Brown
Browse files

ACPI / Wakeup: Simplify enabling of wakeup devices 



To simplify the enabling of wakeup devices during system suspend and
hibernation, merge acpi_enable_wakeup_device_prep() with
acpi_disable_wakeup_device() and remove unnecessary (and no longer
valid) comments from the latter.  Rename acpi_enable_wakeup_device()
to acpi_enable_wakeup_devices() and acpi_disable_wakeup_device()
to acpi_disable_wakeup_devices(), because these functions usually
operate on multiple device objects.

Signed-off-by: default avatarRafael J. Wysocki <rjw@sisk.pl>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent 25bed557

drivers/acpi/sleep.c

+2 −3
Original line number Diff line number Diff line
@@ -73,8 +73,7 @@ static int acpi_sleep_prepare(u32 acpi_state) 
#endif

	printk(KERN_INFO PREFIX "Preparing to enter system sleep state S%d\n",

		acpi_state);

	acpi_enable_wakeup_device_prep(acpi_state);

	acpi_enable_wakeup_device(acpi_state);

	acpi_enable_wakeup_devices(acpi_state);

	acpi_enter_sleep_state_prep(acpi_state);

	return 0;

}
@@ -153,7 +152,7 @@ static void acpi_pm_finish(void) 


	printk(KERN_INFO PREFIX "Waking up from system sleep state S%d\n",

		acpi_state);

	acpi_disable_wakeup_device(acpi_state);

	acpi_disable_wakeup_devices(acpi_state);

	acpi_leave_sleep_state(acpi_state);



	/* reset firmware waking vector */

drivers/acpi/sleep.h

+2 −3
Original line number Diff line number Diff line
@@ -2,9 +2,8 @@ 
extern u8 sleep_states[];

extern int acpi_suspend(u32 state);



extern void acpi_enable_wakeup_device_prep(u8 sleep_state);

extern void acpi_enable_wakeup_device(u8 sleep_state);

extern void acpi_disable_wakeup_device(u8 sleep_state);

extern void acpi_enable_wakeup_devices(u8 sleep_state);

extern void acpi_disable_wakeup_devices(u8 sleep_state);



extern struct list_head acpi_wakeup_device_list;

extern struct mutex acpi_device_lock;

drivers/acpi/wakeup.c

+10 −38
Original line number Diff line number Diff line
@@ -21,45 +21,17 @@ 
ACPI_MODULE_NAME("wakeup_devices")



/**

 * acpi_enable_wakeup_device_prep - Prepare wake-up devices.

 * acpi_enable_wakeup_devices - Enable wake-up device GPEs.

 * @sleep_state: ACPI system sleep state.

 *

 * Enable all wake-up devices' power, unless the requested system sleep state is

 * too deep.

 * Enable wakeup device power of devices with the state.enable flag set and set

 * the wakeup enable mask bits in the GPE registers that correspond to wakeup

 * devices.

 */

void acpi_enable_wakeup_device_prep(u8 sleep_state)

void acpi_enable_wakeup_devices(u8 sleep_state)

{

	struct list_head *node, *next;



	list_for_each_safe(node, next, &acpi_wakeup_device_list) {

		struct acpi_device *dev = container_of(node,

						       struct acpi_device,

						       wakeup_list);



		if (!dev->wakeup.flags.valid || !dev->wakeup.state.enabled

		    || (sleep_state > (u32) dev->wakeup.sleep_state))

			continue;



		acpi_enable_wakeup_device_power(dev, sleep_state);

	}

}



/**

 * acpi_enable_wakeup_device - Enable wake-up device GPEs.

 * @sleep_state: ACPI system sleep state.

 *

 * Enable all wake-up devices' GPEs, with the assumption that

 * acpi_disable_all_gpes() was executed before, so we don't need to disable any

 * GPEs here.

 */

void acpi_enable_wakeup_device(u8 sleep_state)

{

	struct list_head *node, *next;



	/* 

	 * Caution: this routine must be invoked when interrupt is disabled 

	 * Refer ACPI2.0: P212

	 */

	list_for_each_safe(node, next, &acpi_wakeup_device_list) {

		struct acpi_device *dev =

			container_of(node, struct acpi_device, wakeup_list);
@@ -68,6 +40,9 @@ void acpi_enable_wakeup_device(u8 sleep_state) 
		    || sleep_state > (u32) dev->wakeup.sleep_state)

			continue;



		if (dev->wakeup.state.enabled)

			acpi_enable_wakeup_device_power(dev, sleep_state);



		/* The wake-up power should have been enabled already. */

		acpi_enable_gpe(dev->wakeup.gpe_device, dev->wakeup.gpe_number,

				ACPI_GPE_TYPE_WAKE);
@@ -75,13 +50,10 @@ void acpi_enable_wakeup_device(u8 sleep_state) 
}



/**

 * acpi_disable_wakeup_device - Disable devices' wakeup capability.

 * acpi_disable_wakeup_devices - Disable devices' wakeup capability.

 * @sleep_state: ACPI system sleep state.

 *

 * This function only affects devices with wakeup.state.enabled set, which means

 * that it reverses the changes made by acpi_enable_wakeup_device_prep().

 */

void acpi_disable_wakeup_device(u8 sleep_state)

void acpi_disable_wakeup_devices(u8 sleep_state)

{

	struct list_head *node, *next;