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>

4 files changed, 11 insertions, 15 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 {
 #define ACPI_BITMASK_SCI_ENABLE                 0x0001
 #define ACPI_BITMASK_BUS_MASTER_RLD             0x0002
 #define ACPI_BITMASK_GLOBAL_LOCK_RELEASE        0x0004
-#define ACPI_BITMASK_SLEEP_TYPE_X               0x1C00
+#define ACPI_BITMASK_SLEEP_TYPE                 0x1C00
 #define ACPI_BITMASK_SLEEP_ENABLE               0x2000
 
 #define ACPI_BITMASK_ARB_DISABLE                0x0001
@@ -844,7 +844,7 @@ struct acpi_bit_register_info {
 #define ACPI_BITPOSITION_SCI_ENABLE             0x00
 #define ACPI_BITPOSITION_BUS_MASTER_RLD         0x01
 #define ACPI_BITPOSITION_GLOBAL_LOCK_RELEASE    0x02
-#define ACPI_BITPOSITION_SLEEP_TYPE_X           0x0A
+#define ACPI_BITPOSITION_SLEEP_TYPE             0x0A
 #define ACPI_BITPOSITION_SLEEP_ENABLE           0x0D
 
 #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)
         }
 
         sleep_type_reg_info =
-            acpi_hw_get_bit_register_info(ACPI_BITREG_SLEEP_TYPE_A);
+            acpi_hw_get_bit_register_info(ACPI_BITREG_SLEEP_TYPE);
         sleep_enable_reg_info =
             acpi_hw_get_bit_register_info(ACPI_BITREG_SLEEP_ENABLE);
 
@@ -486,7 +486,7 @@ acpi_status acpi_leave_sleep_state_prep(u8 sleep_state)
                                           &acpi_gbl_sleep_type_b);
         if (ACPI_SUCCESS(status)) {
                 sleep_type_reg_info =
-                    acpi_hw_get_bit_register_info(ACPI_BITREG_SLEEP_TYPE_A);
+                    acpi_hw_get_bit_register_info(ACPI_BITREG_SLEEP_TYPE);
                 sleep_enable_reg_info =
                     acpi_hw_get_bit_register_info(ACPI_BITREG_SLEEP_ENABLE);
 
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] = {
         /* ACPI_BITREG_GLOBAL_LOCK_RELEASE  */ {ACPI_REGISTER_PM1_CONTROL,
                                                 ACPI_BITPOSITION_GLOBAL_LOCK_RELEASE,
                                                 ACPI_BITMASK_GLOBAL_LOCK_RELEASE},
-        /* ACPI_BITREG_SLEEP_TYPE_A         */ {ACPI_REGISTER_PM1_CONTROL,
-                                                ACPI_BITPOSITION_SLEEP_TYPE_X,
-                                                ACPI_BITMASK_SLEEP_TYPE_X},
-        /* ACPI_BITREG_SLEEP_TYPE_B         */ {ACPI_REGISTER_PM1_CONTROL,
-                                                ACPI_BITPOSITION_SLEEP_TYPE_X,
-                                                ACPI_BITMASK_SLEEP_TYPE_X},
+        /* ACPI_BITREG_SLEEP_TYPE           */ {ACPI_REGISTER_PM1_CONTROL,
+                                                ACPI_BITPOSITION_SLEEP_TYPE,
+                                                ACPI_BITMASK_SLEEP_TYPE},
         /* ACPI_BITREG_SLEEP_ENABLE         */ {ACPI_REGISTER_PM1_CONTROL,
                                                 ACPI_BITPOSITION_SLEEP_ENABLE,
                                                 ACPI_BITMASK_SLEEP_ENABLE},
diff --git a/include/acpi/actypes.h b/include/acpi/actypes.h
index a20aab510173..1b9601c665e6 100644
--- a/include/acpi/actypes.h
+++ b/include/acpi/actypes.h
@@ -777,15 +777,14 @@ typedef u8 acpi_adr_space_type;
 #define ACPI_BITREG_SCI_ENABLE                  0x0E
 #define ACPI_BITREG_BUS_MASTER_RLD              0x0F
 #define ACPI_BITREG_GLOBAL_LOCK_RELEASE         0x10
-#define ACPI_BITREG_SLEEP_TYPE_A                0x11
-#define ACPI_BITREG_SLEEP_TYPE_B                0x12
-#define ACPI_BITREG_SLEEP_ENABLE                0x13
+#define ACPI_BITREG_SLEEP_TYPE                  0x11
+#define ACPI_BITREG_SLEEP_ENABLE                0x12
 
 /* PM2 Control register */
 
-#define ACPI_BITREG_ARB_DISABLE                 0x14
+#define ACPI_BITREG_ARB_DISABLE                 0x13
 
-#define ACPI_BITREG_MAX                         0x14
+#define ACPI_BITREG_MAX                         0x13
 #define ACPI_NUM_BITREG                         ACPI_BITREG_MAX + 1
 
 /*