diff options
author | Bob Moore <robert.moore@intel.com> | 2013-04-11 20:25:29 -0400 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-04-12 07:29:47 -0400 |
commit | 60f3deb54f413404f3aa1190e48b154481413a39 (patch) | |
tree | f475f264b5b63c8aa2f232d7b2045ea65ed37e31 /drivers/acpi/acpica | |
parent | 663b95f23508b85b9dc162f3f896a8d2be3d46c7 (diff) |
ACPICA: Remove FORCE_DELETE option for global reference count mechanism
This option is not used and is obsolete.
Signed-off-by: Bob Moore <robert.moore@intel.com>
Signed-off-by: Lv Zheng <lv.zheng@intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'drivers/acpi/acpica')
-rw-r--r-- | drivers/acpi/acpica/acutils.h | 3 | ||||
-rw-r--r-- | drivers/acpi/acpica/utdelete.c | 14 |
2 files changed, 3 insertions, 14 deletions
diff --git a/drivers/acpi/acpica/acutils.h b/drivers/acpi/acpica/acutils.h index bbeb961d3a91..202f4f12d3e2 100644 --- a/drivers/acpi/acpica/acutils.h +++ b/drivers/acpi/acpica/acutils.h | |||
@@ -113,9 +113,10 @@ struct acpi_pkg_info { | |||
113 | u32 num_packages; | 113 | u32 num_packages; |
114 | }; | 114 | }; |
115 | 115 | ||
116 | /* Object reference counts */ | ||
117 | |||
116 | #define REF_INCREMENT (u16) 0 | 118 | #define REF_INCREMENT (u16) 0 |
117 | #define REF_DECREMENT (u16) 1 | 119 | #define REF_DECREMENT (u16) 1 |
118 | #define REF_FORCE_DELETE (u16) 2 | ||
119 | 120 | ||
120 | /* acpi_ut_dump_buffer */ | 121 | /* acpi_ut_dump_buffer */ |
121 | 122 | ||
diff --git a/drivers/acpi/acpica/utdelete.c b/drivers/acpi/acpica/utdelete.c index 2541de420249..fc11ad12747d 100644 --- a/drivers/acpi/acpica/utdelete.c +++ b/drivers/acpi/acpica/utdelete.c | |||
@@ -424,17 +424,6 @@ acpi_ut_update_ref_count(union acpi_operand_object *object, u32 action) | |||
424 | } | 424 | } |
425 | break; | 425 | break; |
426 | 426 | ||
427 | case REF_FORCE_DELETE: | ||
428 | |||
429 | ACPI_DEBUG_PRINT((ACPI_DB_ALLOCATIONS, | ||
430 | "Obj %p Refs=%X, Force delete! (Set to 0)\n", | ||
431 | object, count)); | ||
432 | |||
433 | new_count = 0; | ||
434 | object->common.reference_count = new_count; | ||
435 | acpi_ut_delete_internal_obj(object); | ||
436 | break; | ||
437 | |||
438 | default: | 427 | default: |
439 | 428 | ||
440 | ACPI_ERROR((AE_INFO, "Unknown action (0x%X)", action)); | 429 | ACPI_ERROR((AE_INFO, "Unknown action (0x%X)", action)); |
@@ -458,8 +447,7 @@ acpi_ut_update_ref_count(union acpi_operand_object *object, u32 action) | |||
458 | * | 447 | * |
459 | * PARAMETERS: object - Increment ref count for this object | 448 | * PARAMETERS: object - Increment ref count for this object |
460 | * and all sub-objects | 449 | * and all sub-objects |
461 | * action - Either REF_INCREMENT or REF_DECREMENT or | 450 | * action - Either REF_INCREMENT or REF_DECREMENT |
462 | * REF_FORCE_DELETE | ||
463 | * | 451 | * |
464 | * RETURN: Status | 452 | * RETURN: Status |
465 | * | 453 | * |