From 080ebbc80ac9349a2385121445a7cbce45d838c8 Mon Sep 17 00:00:00 2001 From: Bob Moore Date: Fri, 12 Apr 2013 00:25:29 +0000 Subject: [PATCH] --- yaml --- r: 367588 b: refs/heads/master c: 60f3deb54f413404f3aa1190e48b154481413a39 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/acpi/acpica/acutils.h | 3 ++- trunk/drivers/acpi/acpica/utdelete.c | 14 +------------- 3 files changed, 4 insertions(+), 15 deletions(-) diff --git a/[refs] b/[refs] index 46d49e07dc43..2e97155cc111 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 663b95f23508b85b9dc162f3f896a8d2be3d46c7 +refs/heads/master: 60f3deb54f413404f3aa1190e48b154481413a39 diff --git a/trunk/drivers/acpi/acpica/acutils.h b/trunk/drivers/acpi/acpica/acutils.h index bbeb961d3a91..202f4f12d3e2 100644 --- a/trunk/drivers/acpi/acpica/acutils.h +++ b/trunk/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/trunk/drivers/acpi/acpica/utdelete.c b/trunk/drivers/acpi/acpica/utdelete.c index 2541de420249..fc11ad12747d 100644 --- a/trunk/drivers/acpi/acpica/utdelete.c +++ b/trunk/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 *