diff options
author | Bob Moore <robert.moore@intel.com> | 2009-02-18 01:44:03 -0500 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2009-03-26 16:38:27 -0400 |
commit | 3371c19c294a4cb3649aa4e84606be8a1d999e61 (patch) | |
tree | 6201f4f821cea0efece26658b88ea3f35810e169 /drivers/acpi/acpica/hwxface.c | |
parent | 32c9ef994d91352b710b948ec369cd18d6bca51b (diff) |
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>
Diffstat (limited to 'drivers/acpi/acpica/hwxface.c')
-rw-r--r-- | drivers/acpi/acpica/hwxface.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/acpi/acpica/hwxface.c b/drivers/acpi/acpica/hwxface.c index f67562ea0010..4df9eacb7c88 100644 --- a/drivers/acpi/acpica/hwxface.c +++ b/drivers/acpi/acpica/hwxface.c | |||
@@ -532,7 +532,7 @@ acpi_get_sleep_type_data(u8 sleep_state, u8 *sleep_type_a, u8 *sleep_type_b) | |||
532 | 532 | ||
533 | /* It must be of type Package */ | 533 | /* It must be of type Package */ |
534 | 534 | ||
535 | else if (ACPI_GET_OBJECT_TYPE(info->return_object) != ACPI_TYPE_PACKAGE) { | 535 | else if (info->return_object->common.type != ACPI_TYPE_PACKAGE) { |
536 | ACPI_ERROR((AE_INFO, | 536 | ACPI_ERROR((AE_INFO, |
537 | "Sleep State return object is not a Package")); | 537 | "Sleep State return object is not a Package")); |
538 | status = AE_AML_OPERAND_TYPE; | 538 | status = AE_AML_OPERAND_TYPE; |
@@ -553,9 +553,9 @@ acpi_get_sleep_type_data(u8 sleep_state, u8 *sleep_type_a, u8 *sleep_type_b) | |||
553 | 553 | ||
554 | /* The first two elements must both be of type Integer */ | 554 | /* The first two elements must both be of type Integer */ |
555 | 555 | ||
556 | else if ((ACPI_GET_OBJECT_TYPE(info->return_object->package.elements[0]) | 556 | else if (((info->return_object->package.elements[0])->common.type |
557 | != ACPI_TYPE_INTEGER) || | 557 | != ACPI_TYPE_INTEGER) || |
558 | (ACPI_GET_OBJECT_TYPE(info->return_object->package.elements[1]) | 558 | ((info->return_object->package.elements[1])->common.type |
559 | != ACPI_TYPE_INTEGER)) { | 559 | != ACPI_TYPE_INTEGER)) { |
560 | ACPI_ERROR((AE_INFO, | 560 | ACPI_ERROR((AE_INFO, |
561 | "Sleep State return package elements are not both Integers (%s, %s)", | 561 | "Sleep State return package elements are not both Integers (%s, %s)", |