ACPICA: Remove ACPI_GET_OBJECT_TYPE macro

Remove all instances of this obsolete macro, since it is now a
simple reference to ->common.type. There were about 150 invocations
of the macro across 41 files. ACPICA BZ 755.

http://www.acpica.org/bugzilla/show_bug.cgi?id=755

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>

1 files changed, 11 insertions, 12 deletions

diff --git a/drivers/acpi/acpica/exresop.c b/drivers/acpi/acpica/exresop.c
index 3c3802764bfb..5c729a9e9131 100644
--- a/drivers/acpi/acpica/exresop.c
+++ b/drivers/acpi/acpica/exresop.c
@@ -212,7 +212,7 @@ acpi_ex_resolve_operands(u16 opcode,
 
                         /* ACPI internal object */
 
-                        object_type = ACPI_GET_OBJECT_TYPE(obj_desc);
+                        object_type = obj_desc->common.type;
 
                         /* Check for bad acpi_object_type */
 
@@ -287,8 +287,7 @@ acpi_ex_resolve_operands(u16 opcode,
 
                         if ((ACPI_GET_DESCRIPTOR_TYPE(obj_desc) ==
                              ACPI_DESC_TYPE_OPERAND)
-                            && (ACPI_GET_OBJECT_TYPE(obj_desc) ==
-                                ACPI_TYPE_STRING)) {
+                            && (obj_desc->common.type == ACPI_TYPE_STRING)) {
                                 /*
                                  * String found - the string references a named object and
                                  * must be resolved to a node
@@ -336,7 +335,7 @@ acpi_ex_resolve_operands(u16 opcode,
                          * -- All others must be resolved below.
                          */
                         if ((opcode == AML_STORE_OP) &&
-                            (ACPI_GET_OBJECT_TYPE(*stack_ptr) ==
+                            ((*stack_ptr)->common.type ==
                              ACPI_TYPE_LOCAL_REFERENCE)
                             && ((*stack_ptr)->reference.class == ACPI_REFCLASS_INDEX)) {
                                 goto next_operand;
@@ -490,7 +489,7 @@ acpi_ex_resolve_operands(u16 opcode,
 
                         /* Need an operand of type INTEGER, STRING or BUFFER */
 
-                        switch (ACPI_GET_OBJECT_TYPE(obj_desc)) {
+                        switch (obj_desc->common.type) {
                         case ACPI_TYPE_INTEGER:
                         case ACPI_TYPE_STRING:
                         case ACPI_TYPE_BUFFER:
@@ -512,7 +511,7 @@ acpi_ex_resolve_operands(u16 opcode,
 
                         /* Need an operand of type STRING or BUFFER */
 
-                        switch (ACPI_GET_OBJECT_TYPE(obj_desc)) {
+                        switch (obj_desc->common.type) {
                         case ACPI_TYPE_STRING:
                         case ACPI_TYPE_BUFFER:
 
@@ -553,7 +552,7 @@ acpi_ex_resolve_operands(u16 opcode,
                          * The only reference allowed here is a direct reference to
                          * a namespace node.
                          */
-                        switch (ACPI_GET_OBJECT_TYPE(obj_desc)) {
+                        switch (obj_desc->common.type) {
                         case ACPI_TYPE_PACKAGE:
                         case ACPI_TYPE_STRING:
                         case ACPI_TYPE_BUFFER:
@@ -576,7 +575,7 @@ acpi_ex_resolve_operands(u16 opcode,
 
                         /* Need a buffer or package or (ACPI 2.0) String */
 
-                        switch (ACPI_GET_OBJECT_TYPE(obj_desc)) {
+                        switch (obj_desc->common.type) {
                         case ACPI_TYPE_PACKAGE:
                         case ACPI_TYPE_STRING:
                         case ACPI_TYPE_BUFFER:
@@ -598,7 +597,7 @@ acpi_ex_resolve_operands(u16 opcode,
 
                         /* Need an operand of type REGION or a BUFFER (which could be a resolved region field) */
 
-                        switch (ACPI_GET_OBJECT_TYPE(obj_desc)) {
+                        switch (obj_desc->common.type) {
                         case ACPI_TYPE_BUFFER:
                         case ACPI_TYPE_REGION:
 
@@ -619,7 +618,7 @@ acpi_ex_resolve_operands(u16 opcode,
 
                         /* Used by the Store() operator only */
 
-                        switch (ACPI_GET_OBJECT_TYPE(obj_desc)) {
+                        switch (obj_desc->common.type) {
                         case ACPI_TYPE_INTEGER:
                         case ACPI_TYPE_PACKAGE:
                         case ACPI_TYPE_STRING:
@@ -677,8 +676,8 @@ acpi_ex_resolve_operands(u16 opcode,
                  * required object type (Simple cases only).
                  */
                 status = acpi_ex_check_object_type(type_needed,
-                                                   ACPI_GET_OBJECT_TYPE
-                                                   (*stack_ptr), *stack_ptr);
+                                                   (*stack_ptr)->common.type,
+                                                   *stack_ptr);
                 if (ACPI_FAILURE(status)) {
                         return_ACPI_STATUS(status);
                 }