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, 7 insertions, 7 deletions

diff --git a/drivers/acpi/acpica/exmisc.c b/drivers/acpi/acpica/exmisc.c
index 6b0747ac683b..998eac329937 100644
--- a/drivers/acpi/acpica/exmisc.c
+++ b/drivers/acpi/acpica/exmisc.c
@@ -80,7 +80,7 @@ acpi_ex_get_object_reference(union acpi_operand_object *obj_desc,
         switch (ACPI_GET_DESCRIPTOR_TYPE(obj_desc)) {
         case ACPI_DESC_TYPE_OPERAND:
 
-                if (ACPI_GET_OBJECT_TYPE(obj_desc) != ACPI_TYPE_LOCAL_REFERENCE) {
+                if (obj_desc->common.type != ACPI_TYPE_LOCAL_REFERENCE) {
                         return_ACPI_STATUS(AE_AML_OPERAND_TYPE);
                 }
 
@@ -260,7 +260,7 @@ acpi_ex_do_concatenate(union acpi_operand_object *operand0,
          * guaranteed to be either Integer/String/Buffer by the operand
          * resolution mechanism.
          */
-        switch (ACPI_GET_OBJECT_TYPE(operand0)) {
+        switch (operand0->common.type) {
         case ACPI_TYPE_INTEGER:
                 status =
                     acpi_ex_convert_to_integer(operand1, &local_operand1, 16);
@@ -277,7 +277,7 @@ acpi_ex_do_concatenate(union acpi_operand_object *operand0,
 
         default:
                 ACPI_ERROR((AE_INFO, "Invalid object type: %X",
-                            ACPI_GET_OBJECT_TYPE(operand0)));
+                            operand0->common.type));
                 status = AE_AML_INTERNAL;
         }
 
@@ -298,7 +298,7 @@ acpi_ex_do_concatenate(union acpi_operand_object *operand0,
          * 2) Two Strings concatenated to produce a new String
          * 3) Two Buffers concatenated to produce a new Buffer
          */
-        switch (ACPI_GET_OBJECT_TYPE(operand0)) {
+        switch (operand0->common.type) {
         case ACPI_TYPE_INTEGER:
 
                 /* Result of two Integers is a Buffer */
@@ -379,7 +379,7 @@ acpi_ex_do_concatenate(union acpi_operand_object *operand0,
                 /* Invalid object type, should not happen here */
 
                 ACPI_ERROR((AE_INFO, "Invalid object type: %X",
-                            ACPI_GET_OBJECT_TYPE(operand0)));
+                            operand0->common.type));
                 status = AE_AML_INTERNAL;
                 goto cleanup;
         }
@@ -581,7 +581,7 @@ acpi_ex_do_logical_op(u16 opcode,
          * guaranteed to be either Integer/String/Buffer by the operand
          * resolution mechanism.
          */
-        switch (ACPI_GET_OBJECT_TYPE(operand0)) {
+        switch (operand0->common.type) {
         case ACPI_TYPE_INTEGER:
                 status =
                     acpi_ex_convert_to_integer(operand1, &local_operand1, 16);
@@ -608,7 +608,7 @@ acpi_ex_do_logical_op(u16 opcode,
         /*
          * Two cases: 1) Both Integers, 2) Both Strings or Buffers
          */
-        if (ACPI_GET_OBJECT_TYPE(operand0) == ACPI_TYPE_INTEGER) {
+        if (operand0->common.type == ACPI_TYPE_INTEGER) {
                 /*
                  * 1) Both operands are of type integer
                  *    Note: local_operand1 may have changed above