Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f6a22b0b authored by Bob Moore's avatar Bob Moore Committed by Len Brown
Browse files

ACPICA: Standardize integer output for ACPICA warnings/errors 



Always use 0x prefix for hex output, use %u for integer output
(all integers are unsigned.)

Signed-off-by: default avatarBob Moore <robert.moore@intel.com>
Signed-off-by: default avatarLin Ming <ming.m.lin@intel.com>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent 0e264f0b

drivers/acpi/acpica/dsfield.c

+1 −1
Original line number Diff line number Diff line
@@ -323,7 +323,7 @@ acpi_ds_get_field_names(struct acpi_create_field_info *info, 
		default:



			ACPI_ERROR((AE_INFO,

				    "Invalid opcode in field list: %X",

				    "Invalid opcode in field list: 0x%X",

				    arg->common.aml_opcode));

			return_ACPI_STATUS(AE_AML_BAD_OPCODE);

		}

drivers/acpi/acpica/dsmethod.c

+1 −1
Original line number Diff line number Diff line
@@ -225,7 +225,7 @@ acpi_ds_begin_method_execution(struct acpi_namespace_node *method_node, 
		    (walk_state->thread->current_sync_level >

		     obj_desc->method.mutex->mutex.sync_level)) {

			ACPI_ERROR((AE_INFO,

				    "Cannot acquire Mutex for method [%4.4s], current SyncLevel is too large (%d)",

				    "Cannot acquire Mutex for method [%4.4s], current SyncLevel is too large (%u)",

				    acpi_ut_get_node_name(method_node),

				    walk_state->thread->current_sync_level));

drivers/acpi/acpica/dsmthdat.c

+5 −5
Original line number Diff line number Diff line
@@ -262,7 +262,7 @@ acpi_ds_method_data_get_node(u8 type, 


		if (index > ACPI_METHOD_MAX_LOCAL) {

			ACPI_ERROR((AE_INFO,

				    "Local index %d is invalid (max %d)",

				    "Local index %u is invalid (max %u)",

				    index, ACPI_METHOD_MAX_LOCAL));

			return_ACPI_STATUS(AE_AML_INVALID_INDEX);

		}
@@ -276,7 +276,7 @@ acpi_ds_method_data_get_node(u8 type, 


		if (index > ACPI_METHOD_MAX_ARG) {

			ACPI_ERROR((AE_INFO,

				    "Arg index %d is invalid (max %d)",

				    "Arg index %u is invalid (max %u)",

				    index, ACPI_METHOD_MAX_ARG));

			return_ACPI_STATUS(AE_AML_INVALID_INDEX);

		}
@@ -287,7 +287,7 @@ acpi_ds_method_data_get_node(u8 type, 
		break;



	default:

		ACPI_ERROR((AE_INFO, "Type %d is invalid", type));

		ACPI_ERROR((AE_INFO, "Type %u is invalid", type));

		return_ACPI_STATUS(AE_TYPE);

	}
@@ -424,7 +424,7 @@ acpi_ds_method_data_get_value(u8 type, 
			case ACPI_REFCLASS_ARG:



				ACPI_ERROR((AE_INFO,

					    "Uninitialized Arg[%d] at node %p",

					    "Uninitialized Arg[%u] at node %p",

					    index, node));



				return_ACPI_STATUS(AE_AML_UNINITIALIZED_ARG);
@@ -440,7 +440,7 @@ acpi_ds_method_data_get_value(u8 type, 
			default:



				ACPI_ERROR((AE_INFO,

					    "Not a Arg/Local opcode: %X",

					    "Not a Arg/Local opcode: 0x%X",

					    type));

				return_ACPI_STATUS(AE_AML_INTERNAL);

			}

drivers/acpi/acpica/dsobject.c

+7 −7
Original line number Diff line number Diff line
@@ -288,7 +288,7 @@ acpi_ds_build_internal_buffer_obj(struct acpi_walk_state *walk_state, 
	if (byte_list) {

		if (byte_list->common.aml_opcode != AML_INT_BYTELIST_OP) {

			ACPI_ERROR((AE_INFO,

				    "Expecting bytelist, got AML opcode %X in op %p",

				    "Expecting bytelist, found AML opcode 0x%X in op %p",

				    byte_list->common.aml_opcode, byte_list));



			acpi_ut_remove_reference(obj_desc);
@@ -511,7 +511,7 @@ acpi_ds_build_internal_package_obj(struct acpi_walk_state *walk_state, 
		}



		ACPI_INFO((AE_INFO,

			   "Actual Package length (0x%X) is larger than NumElements field (0x%X), truncated\n",

			   "Actual Package length (%u) is larger than NumElements field (%u), truncated\n",

			   i, element_count));

	} else if (i < element_count) {

		/*
@@ -519,7 +519,7 @@ acpi_ds_build_internal_package_obj(struct acpi_walk_state *walk_state, 
		 * Note: this is not an error, the package is padded out with NULLs.

		 */

		ACPI_DEBUG_PRINT((ACPI_DB_INFO,

				  "Package List length (0x%X) smaller than NumElements count (0x%X), padded with null elements\n",

				  "Package List length (%u) smaller than NumElements count (%u), padded with null elements\n",

				  i, element_count));

	}
@@ -701,7 +701,7 @@ acpi_ds_init_object_from_op(struct acpi_walk_state *walk_state, 
			default:



				ACPI_ERROR((AE_INFO,

					    "Unknown constant opcode %X",

					    "Unknown constant opcode 0x%X",

					    opcode));

				status = AE_AML_OPERAND_TYPE;

				break;
@@ -717,7 +717,7 @@ acpi_ds_init_object_from_op(struct acpi_walk_state *walk_state, 
			break;



		default:

			ACPI_ERROR((AE_INFO, "Unknown Integer type %X",

			ACPI_ERROR((AE_INFO, "Unknown Integer type 0x%X",

				    op_info->type));

			status = AE_AML_OPERAND_TYPE;

			break;
@@ -806,7 +806,7 @@ acpi_ds_init_object_from_op(struct acpi_walk_state *walk_state, 
			default:



				ACPI_ERROR((AE_INFO,

					    "Unimplemented reference type for AML opcode: %4.4X",

					    "Unimplemented reference type for AML opcode: 0x%4.4X",

					    opcode));

				return_ACPI_STATUS(AE_AML_OPERAND_TYPE);

			}
@@ -816,7 +816,7 @@ acpi_ds_init_object_from_op(struct acpi_walk_state *walk_state, 


	default:



		ACPI_ERROR((AE_INFO, "Unimplemented data type: %X",

		ACPI_ERROR((AE_INFO, "Unimplemented data type: 0x%X",

			    obj_desc->common.type));



		status = AE_AML_OPERAND_TYPE;

drivers/acpi/acpica/dsopcode.c

+7 −6
Original line number Diff line number Diff line
@@ -292,7 +292,7 @@ acpi_status acpi_ds_get_buffer_arguments(union acpi_operand_object *obj_desc) 
	node = obj_desc->buffer.node;

	if (!node) {

		ACPI_ERROR((AE_INFO,

			    "No pointer back to NS node in buffer obj %p",

			    "No pointer back to namespace node in buffer object %p",

			    obj_desc));

		return_ACPI_STATUS(AE_AML_INTERNAL);

	}
@@ -336,7 +336,7 @@ acpi_status acpi_ds_get_package_arguments(union acpi_operand_object *obj_desc) 
	node = obj_desc->package.node;

	if (!node) {

		ACPI_ERROR((AE_INFO,

			    "No pointer back to NS node in package %p",

			    "No pointer back to namespace node in package %p",

			    obj_desc));

		return_ACPI_STATUS(AE_AML_INTERNAL);

	}
@@ -580,7 +580,8 @@ acpi_ds_init_buffer_field(u16 aml_opcode, 
	default:



		ACPI_ERROR((AE_INFO,

			    "Unknown field creation opcode %02x", aml_opcode));

			    "Unknown field creation opcode 0x%02X",

			    aml_opcode));

		status = AE_AML_BAD_OPCODE;

		goto cleanup;

	}
@@ -589,7 +590,7 @@ acpi_ds_init_buffer_field(u16 aml_opcode, 


	if ((bit_offset + bit_count) > (8 * (u32) buffer_desc->buffer.length)) {

		ACPI_ERROR((AE_INFO,

			    "Field [%4.4s] at %d exceeds Buffer [%4.4s] size %d (bits)",

			    "Field [%4.4s] at %u exceeds Buffer [%4.4s] size %u (bits)",

			    acpi_ut_get_node_name(result_desc),

			    bit_offset + bit_count,

			    acpi_ut_get_node_name(buffer_desc->buffer.node),
@@ -693,7 +694,7 @@ acpi_ds_eval_buffer_field_operands(struct acpi_walk_state *walk_state, 
	status = acpi_ex_resolve_operands(op->common.aml_opcode,

					  ACPI_WALK_OPERANDS, walk_state);

	if (ACPI_FAILURE(status)) {

		ACPI_ERROR((AE_INFO, "(%s) bad operand(s) (%X)",

		ACPI_ERROR((AE_INFO, "(%s) bad operand(s), status 0x%X",

			    acpi_ps_get_opcode_name(op->common.aml_opcode),

			    status));
@@ -1461,7 +1462,7 @@ acpi_ds_exec_end_control_op(struct acpi_walk_state * walk_state, 


	default:



		ACPI_ERROR((AE_INFO, "Unknown control opcode=%X Op=%p",

		ACPI_ERROR((AE_INFO, "Unknown control opcode=0x%X Op=%p",

			    op->common.aml_opcode, op));



		status = AE_AML_BAD_OPCODE;