From: Bob Moore Date: Fri, 12 Apr 2013 00:25:29 +0000 (+0000) Subject: ACPICA: Remove FORCE_DELETE option for global reference count mechanism X-Git-Tag: Ubuntu-snapdragon-4.4.0-1029.32~11070^2~8^2~3 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=60f3deb54f413404f3aa1190e48b154481413a39;p=mirror_ubuntu-zesty-kernel.git ACPICA: Remove FORCE_DELETE option for global reference count mechanism This option is not used and is obsolete. Signed-off-by: Bob Moore Signed-off-by: Lv Zheng Signed-off-by: Rafael J. Wysocki --- 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 { u32 num_packages; }; +/* Object reference counts */ + #define REF_INCREMENT (u16) 0 #define REF_DECREMENT (u16) 1 -#define REF_FORCE_DELETE (u16) 2 /* acpi_ut_dump_buffer */ 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) } break; - case REF_FORCE_DELETE: - - ACPI_DEBUG_PRINT((ACPI_DB_ALLOCATIONS, - "Obj %p Refs=%X, Force delete! (Set to 0)\n", - object, count)); - - new_count = 0; - object->common.reference_count = new_count; - acpi_ut_delete_internal_obj(object); - break; - default: 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) * * PARAMETERS: object - Increment ref count for this object * and all sub-objects - * action - Either REF_INCREMENT or REF_DECREMENT or - * REF_FORCE_DELETE + * action - Either REF_INCREMENT or REF_DECREMENT * * RETURN: Status *