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

Commit 7fa69baf authored by Rafael J. Wysocki's avatar Rafael J. Wysocki Committed by Len Brown
Browse files

ACPI / PM: Drop special ACPI wakeup flags 



Drop special ACPI wakeup flags, wakeup.state.enabled and
wakeup.flags.always_enabled, that aren't necessary any more after
we've started to use standard device wakeup flags for handling ACPI
wakeup devices.

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

drivers/acpi/glue.c

+1 −4
Original line number Diff line number Diff line
@@ -167,11 +167,8 @@ static int acpi_bind_one(struct device *dev, acpi_handle handle) 
				"firmware_node");

		ret = sysfs_create_link(&acpi_dev->dev.kobj, &dev->kobj,

				"physical_node");

		if (acpi_dev->wakeup.flags.valid) {

		if (acpi_dev->wakeup.flags.valid)

			device_set_wakeup_capable(dev, true);

			device_set_wakeup_enable(dev,

						acpi_dev->wakeup.state.enabled);

		}

	}



	return 0;

include/acpi/acpi_bus.h

+0 −6
Original line number Diff line number Diff line
@@ -242,20 +242,14 @@ struct acpi_device_perf { 
struct acpi_device_wakeup_flags {

	u8 valid:1;		/* Can successfully enable wakeup? */

	u8 run_wake:1;		/* Run-Wake GPE devices */

	u8 always_enabled:1;	/* Run-wake devices that are always enabled */

	u8 notifier_present:1;  /* Wake-up notify handler has been installed */

};



struct acpi_device_wakeup_state {

	u8 enabled:1;

};



struct acpi_device_wakeup {

	acpi_handle gpe_device;

	u64 gpe_number;

	u64 sleep_state;

	struct acpi_handle_list resources;

	struct acpi_device_wakeup_state state;

	struct acpi_device_wakeup_flags flags;

	int prepare_count;

	int run_wake_count;