Commit 68aafc35 authored by Bob Moore's avatar Bob Moore Committed by Rafael J. Wysocki
Browse files

ACPICA: Audit/update for ACPICA return macros and debug depth counter 



1) Ensure that all functions that use the various TRACE macros
   also use the appropriate ACPICA return macros.
2) Ensure that all normal return statements surround the return
   expression (value) with parens.

Signed-off-by: default avatarBob Moore <robert.moore@intel.com>
Signed-off-by: default avatarLv Zheng <lv.zheng@intel.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 86ff0e50

drivers/acpi/acpica/dswload2.c

+2 −2
Original line number Diff line number Diff line
@@ -254,7 +254,7 @@ acpi_ds_load2_begin_op(struct acpi_walk_state *walk_state, 
				    acpi_ut_get_type_name(node->type),

				    acpi_ut_get_node_name(node)));



			return (AE_AML_OPERAND_TYPE);

			return_ACPI_STATUS(AE_AML_OPERAND_TYPE);

		}

		break;
@@ -602,7 +602,7 @@ acpi_status acpi_ds_load2_end_op(struct acpi_walk_state *walk_state) 
							  region_space,

							  walk_state);

				if (ACPI_FAILURE(status)) {

					return (status);

					return_ACPI_STATUS(status);

				}



				acpi_ex_exit_interpreter();

drivers/acpi/acpica/dswstate.c

+2 −2
Original line number Diff line number Diff line
@@ -708,13 +708,13 @@ void acpi_ds_delete_walk_state(struct acpi_walk_state *walk_state) 
	ACPI_FUNCTION_TRACE_PTR(ds_delete_walk_state, walk_state);



	if (!walk_state) {

		return;

		return_VOID;

	}



	if (walk_state->descriptor_type != ACPI_DESC_TYPE_WALK) {

		ACPI_ERROR((AE_INFO, "%p is not a valid walk state",

			    walk_state));

		return;

		return_VOID;

	}



	/* There should not be any open scopes */

drivers/acpi/acpica/evxfgpe.c

+2 −2
Original line number Diff line number Diff line
@@ -569,7 +569,7 @@ acpi_install_gpe_block(acpi_handle gpe_device, 


	status = acpi_ut_acquire_mutex(ACPI_MTX_NAMESPACE);

	if (ACPI_FAILURE(status)) {

		return (status);

		return_ACPI_STATUS(status);

	}



	node = acpi_ns_validate_handle(gpe_device);
@@ -652,7 +652,7 @@ acpi_status acpi_remove_gpe_block(acpi_handle gpe_device) 


	status = acpi_ut_acquire_mutex(ACPI_MTX_NAMESPACE);

	if (ACPI_FAILURE(status)) {

		return (status);

		return_ACPI_STATUS(status);

	}



	node = acpi_ns_validate_handle(gpe_device);

drivers/acpi/acpica/exdebug.c

+1 −1
Original line number Diff line number Diff line
@@ -190,7 +190,7 @@ acpi_ex_do_debug_object(union acpi_operand_object *source_desc, 


			acpi_os_printf("Table Index 0x%X\n",

				       source_desc->reference.value);

			return;

			return_VOID;



		default:

			break;

drivers/acpi/acpica/exmutex.c

+1 −1
Original line number Diff line number Diff line
@@ -305,7 +305,7 @@ acpi_status acpi_ex_release_mutex_object(union acpi_operand_object *obj_desc) 
	ACPI_FUNCTION_TRACE(ex_release_mutex_object);



	if (obj_desc->mutex.acquisition_depth == 0) {

		return (AE_NOT_ACQUIRED);

		return_ACPI_STATUS(AE_NOT_ACQUIRED);

	}



	/* Match multiple Acquires with multiple Releases */