diff options
| author | Rafael J. Wysocki <rjw@sisk.pl> | 2011-01-06 23:35:10 +0100 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2011-01-07 01:18:00 -0500 |
| commit | 7fa69baf29de8c77a6b32c054df2abb8f11f8aa4 (patch) | |
| tree | becc4b300b74d3bd85ffdd0e536acf8554cf3872 | |
| parent | f2b56bc808addb908a5bf435d9b942c02af9a7c4 (diff) | |
| download | linux-3.10-7fa69baf29de8c77a6b32c054df2abb8f11f8aa4.tar.gz linux-3.10-7fa69baf29de8c77a6b32c054df2abb8f11f8aa4.tar.bz2 linux-3.10-7fa69baf29de8c77a6b32c054df2abb8f11f8aa4.zip | |
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: Rafael J. Wysocki <rjw@sisk.pl>
Signed-off-by: Len Brown <len.brown@intel.com>
| -rw-r--r-- | drivers/acpi/glue.c | 5 | ||||
| -rw-r--r-- | include/acpi/acpi_bus.h | 6 |
2 files changed, 1 insertions, 10 deletions
diff --git a/drivers/acpi/glue.c b/drivers/acpi/glue.c index 78b0164c35b..7c47ed55e52 100644 --- a/drivers/acpi/glue.c +++ b/drivers/acpi/glue.c @@ -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; diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h index 359ef11725a..f2499f57210 100644 --- a/include/acpi/acpi_bus.h +++ b/include/acpi/acpi_bus.h @@ -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; |