diff options
author | Feng Tang <feng.tang@intel.com> | 2012-08-07 22:20:44 -0400 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2012-09-21 00:26:16 -0400 |
commit | a950c135e5b2be6ef7518d54d98a7901db1b377a (patch) | |
tree | d3e2a2db81050aae25239aa96ce13969a6007492 | |
parent | c46de2263f42fb4bbde411b9126f471e9343cb22 (diff) |
ACPI: delelte more BFS/GTS related definition and code
This is a follow on for commmit 3f6f49c7 "ACPI: delete _GTS/_BFS support"
to do more cleanup.
Signed-off-by: Feng Tang <feng.tang@intel.com>
Signed-off-by: Bob Moore <robert.moore@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
-rw-r--r-- | drivers/acpi/acpica/hwxfsleep.c | 1 | ||||
-rw-r--r-- | include/acpi/acnames.h | 2 | ||||
-rw-r--r-- | include/acpi/actypes.h | 7 |
3 files changed, 0 insertions, 10 deletions
diff --git a/drivers/acpi/acpica/hwxfsleep.c b/drivers/acpi/acpica/hwxfsleep.c index 1f165a750ae2..0ff1ecea5c3a 100644 --- a/drivers/acpi/acpica/hwxfsleep.c +++ b/drivers/acpi/acpica/hwxfsleep.c | |||
@@ -381,7 +381,6 @@ ACPI_EXPORT_SYMBOL(acpi_enter_sleep_state) | |||
381 | * FUNCTION: acpi_leave_sleep_state_prep | 381 | * FUNCTION: acpi_leave_sleep_state_prep |
382 | * | 382 | * |
383 | * PARAMETERS: sleep_state - Which sleep state we are exiting | 383 | * PARAMETERS: sleep_state - Which sleep state we are exiting |
384 | * flags - ACPI_EXECUTE_BFS to run optional method | ||
385 | * | 384 | * |
386 | * RETURN: Status | 385 | * RETURN: Status |
387 | * | 386 | * |
diff --git a/include/acpi/acnames.h b/include/acpi/acnames.h index d988ac54f41e..d2f61dd2d723 100644 --- a/include/acpi/acnames.h +++ b/include/acpi/acnames.h | |||
@@ -66,8 +66,6 @@ | |||
66 | 66 | ||
67 | /* Method names - these methods must appear at the namespace root */ | 67 | /* Method names - these methods must appear at the namespace root */ |
68 | 68 | ||
69 | #define METHOD_PATHNAME__BFS "\\_BFS" | ||
70 | #define METHOD_PATHNAME__GTS "\\_GTS" | ||
71 | #define METHOD_PATHNAME__PTS "\\_PTS" | 69 | #define METHOD_PATHNAME__PTS "\\_PTS" |
72 | #define METHOD_PATHNAME__SST "\\_SI._SST" | 70 | #define METHOD_PATHNAME__SST "\\_SI._SST" |
73 | #define METHOD_PATHNAME__WAK "\\_WAK" | 71 | #define METHOD_PATHNAME__WAK "\\_WAK" |
diff --git a/include/acpi/actypes.h b/include/acpi/actypes.h index 3d00bd5bd7e3..a85bae968262 100644 --- a/include/acpi/actypes.h +++ b/include/acpi/actypes.h | |||
@@ -519,13 +519,6 @@ typedef u64 acpi_integer; | |||
519 | #define ACPI_SLEEP_TYPE_INVALID 0xFF | 519 | #define ACPI_SLEEP_TYPE_INVALID 0xFF |
520 | 520 | ||
521 | /* | 521 | /* |
522 | * Sleep/Wake flags | ||
523 | */ | ||
524 | #define ACPI_NO_OPTIONAL_METHODS 0x00 /* Do not execute any optional methods */ | ||
525 | #define ACPI_EXECUTE_GTS 0x01 /* For enter sleep interface */ | ||
526 | #define ACPI_EXECUTE_BFS 0x02 /* For leave sleep prep interface */ | ||
527 | |||
528 | /* | ||
529 | * Standard notify values | 522 | * Standard notify values |
530 | */ | 523 | */ |
531 | #define ACPI_NOTIFY_BUS_CHECK (u8) 0x00 | 524 | #define ACPI_NOTIFY_BUS_CHECK (u8) 0x00 |