diff options
author | Bob Moore <robert.moore@intel.com> | 2009-02-18 01:31:05 -0500 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2009-03-26 16:38:26 -0400 |
commit | 82d79b86646504a0ab97fe50ac137df65f651a27 (patch) | |
tree | 570156401efd898479331d2c9f4010ecb8073086 /drivers/acpi/acpica | |
parent | ac0c84502697114a378057eed83a9baba879cfc9 (diff) |
ACPICA: Remove redundant ACPI_BITREG_SLEEP_TYPE_B
This type is the same as TYPE_A. Removed this and all related
instances. Renamed SLEEP_TYPE_A to simply SLEEP_TYPE.
ACPICA BZ 754.
http://www.acpica.org/bugzilla/show_bug.cgi?id=754
Signed-off-by: Bob Moore <robert.moore@intel.com>
Signed-off-by: Lin Ming <ming.m.lin@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/acpi/acpica')
-rw-r--r-- | drivers/acpi/acpica/aclocal.h | 4 | ||||
-rw-r--r-- | drivers/acpi/acpica/hwsleep.c | 4 | ||||
-rw-r--r-- | drivers/acpi/acpica/utglobal.c | 9 |
3 files changed, 7 insertions, 10 deletions
diff --git a/drivers/acpi/acpica/aclocal.h b/drivers/acpi/acpica/aclocal.h index 492d02761bb7..b9a0aa67ab10 100644 --- a/drivers/acpi/acpica/aclocal.h +++ b/drivers/acpi/acpica/aclocal.h | |||
@@ -818,7 +818,7 @@ struct acpi_bit_register_info { | |||
818 | #define ACPI_BITMASK_SCI_ENABLE 0x0001 | 818 | #define ACPI_BITMASK_SCI_ENABLE 0x0001 |
819 | #define ACPI_BITMASK_BUS_MASTER_RLD 0x0002 | 819 | #define ACPI_BITMASK_BUS_MASTER_RLD 0x0002 |
820 | #define ACPI_BITMASK_GLOBAL_LOCK_RELEASE 0x0004 | 820 | #define ACPI_BITMASK_GLOBAL_LOCK_RELEASE 0x0004 |
821 | #define ACPI_BITMASK_SLEEP_TYPE_X 0x1C00 | 821 | #define ACPI_BITMASK_SLEEP_TYPE 0x1C00 |
822 | #define ACPI_BITMASK_SLEEP_ENABLE 0x2000 | 822 | #define ACPI_BITMASK_SLEEP_ENABLE 0x2000 |
823 | 823 | ||
824 | #define ACPI_BITMASK_ARB_DISABLE 0x0001 | 824 | #define ACPI_BITMASK_ARB_DISABLE 0x0001 |
@@ -844,7 +844,7 @@ struct acpi_bit_register_info { | |||
844 | #define ACPI_BITPOSITION_SCI_ENABLE 0x00 | 844 | #define ACPI_BITPOSITION_SCI_ENABLE 0x00 |
845 | #define ACPI_BITPOSITION_BUS_MASTER_RLD 0x01 | 845 | #define ACPI_BITPOSITION_BUS_MASTER_RLD 0x01 |
846 | #define ACPI_BITPOSITION_GLOBAL_LOCK_RELEASE 0x02 | 846 | #define ACPI_BITPOSITION_GLOBAL_LOCK_RELEASE 0x02 |
847 | #define ACPI_BITPOSITION_SLEEP_TYPE_X 0x0A | 847 | #define ACPI_BITPOSITION_SLEEP_TYPE 0x0A |
848 | #define ACPI_BITPOSITION_SLEEP_ENABLE 0x0D | 848 | #define ACPI_BITPOSITION_SLEEP_ENABLE 0x0D |
849 | 849 | ||
850 | #define ACPI_BITPOSITION_ARB_DISABLE 0x00 | 850 | #define ACPI_BITPOSITION_ARB_DISABLE 0x00 |
diff --git a/drivers/acpi/acpica/hwsleep.c b/drivers/acpi/acpica/hwsleep.c index a2af2a4f2f26..1a7d260f7826 100644 --- a/drivers/acpi/acpica/hwsleep.c +++ b/drivers/acpi/acpica/hwsleep.c | |||
@@ -242,7 +242,7 @@ acpi_status asmlinkage acpi_enter_sleep_state(u8 sleep_state) | |||
242 | } | 242 | } |
243 | 243 | ||
244 | sleep_type_reg_info = | 244 | sleep_type_reg_info = |
245 | acpi_hw_get_bit_register_info(ACPI_BITREG_SLEEP_TYPE_A); | 245 | acpi_hw_get_bit_register_info(ACPI_BITREG_SLEEP_TYPE); |
246 | sleep_enable_reg_info = | 246 | sleep_enable_reg_info = |
247 | acpi_hw_get_bit_register_info(ACPI_BITREG_SLEEP_ENABLE); | 247 | acpi_hw_get_bit_register_info(ACPI_BITREG_SLEEP_ENABLE); |
248 | 248 | ||
@@ -486,7 +486,7 @@ acpi_status acpi_leave_sleep_state_prep(u8 sleep_state) | |||
486 | &acpi_gbl_sleep_type_b); | 486 | &acpi_gbl_sleep_type_b); |
487 | if (ACPI_SUCCESS(status)) { | 487 | if (ACPI_SUCCESS(status)) { |
488 | sleep_type_reg_info = | 488 | sleep_type_reg_info = |
489 | acpi_hw_get_bit_register_info(ACPI_BITREG_SLEEP_TYPE_A); | 489 | acpi_hw_get_bit_register_info(ACPI_BITREG_SLEEP_TYPE); |
490 | sleep_enable_reg_info = | 490 | sleep_enable_reg_info = |
491 | acpi_hw_get_bit_register_info(ACPI_BITREG_SLEEP_ENABLE); | 491 | acpi_hw_get_bit_register_info(ACPI_BITREG_SLEEP_ENABLE); |
492 | 492 | ||
diff --git a/drivers/acpi/acpica/utglobal.c b/drivers/acpi/acpica/utglobal.c index a3ab9d9da299..bec0e21673cb 100644 --- a/drivers/acpi/acpica/utglobal.c +++ b/drivers/acpi/acpica/utglobal.c | |||
@@ -294,12 +294,9 @@ struct acpi_bit_register_info acpi_gbl_bit_register_info[ACPI_NUM_BITREG] = { | |||
294 | /* ACPI_BITREG_GLOBAL_LOCK_RELEASE */ {ACPI_REGISTER_PM1_CONTROL, | 294 | /* ACPI_BITREG_GLOBAL_LOCK_RELEASE */ {ACPI_REGISTER_PM1_CONTROL, |
295 | ACPI_BITPOSITION_GLOBAL_LOCK_RELEASE, | 295 | ACPI_BITPOSITION_GLOBAL_LOCK_RELEASE, |
296 | ACPI_BITMASK_GLOBAL_LOCK_RELEASE}, | 296 | ACPI_BITMASK_GLOBAL_LOCK_RELEASE}, |
297 | /* ACPI_BITREG_SLEEP_TYPE_A */ {ACPI_REGISTER_PM1_CONTROL, | 297 | /* ACPI_BITREG_SLEEP_TYPE */ {ACPI_REGISTER_PM1_CONTROL, |
298 | ACPI_BITPOSITION_SLEEP_TYPE_X, | 298 | ACPI_BITPOSITION_SLEEP_TYPE, |
299 | ACPI_BITMASK_SLEEP_TYPE_X}, | 299 | ACPI_BITMASK_SLEEP_TYPE}, |
300 | /* ACPI_BITREG_SLEEP_TYPE_B */ {ACPI_REGISTER_PM1_CONTROL, | ||
301 | ACPI_BITPOSITION_SLEEP_TYPE_X, | ||
302 | ACPI_BITMASK_SLEEP_TYPE_X}, | ||
303 | /* ACPI_BITREG_SLEEP_ENABLE */ {ACPI_REGISTER_PM1_CONTROL, | 300 | /* ACPI_BITREG_SLEEP_ENABLE */ {ACPI_REGISTER_PM1_CONTROL, |
304 | ACPI_BITPOSITION_SLEEP_ENABLE, | 301 | ACPI_BITPOSITION_SLEEP_ENABLE, |
305 | ACPI_BITMASK_SLEEP_ENABLE}, | 302 | ACPI_BITMASK_SLEEP_ENABLE}, |