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

ACPICA: Rename nameseg length macro/define for clarity 

ACPICA commit 24870bd9e73d71e2a1ff0a1e94519f8f8409e57d

ACPI_NAME_SIZE changed to ACPI_NAMESEG_SIZE
This clarifies that this is the length of an individual
nameseg, not the length of a generic namestring/namepath.
Improves understanding of the code.

Link: https://github.com/acpica/acpica/commit/24870bd9


Signed-off-by: default avatarBob Moore <robert.moore@intel.com>
Signed-off-by: default avatarErik Schmauss <erik.schmauss@intel.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 5599fb69

drivers/acpi/acpi_configfs.c

+2 −2
Original line number Diff line number Diff line
@@ -109,7 +109,7 @@ static ssize_t acpi_table_signature_show(struct config_item *cfg, char *str) 
	if (!h)

		return -EINVAL;



	return sprintf(str, "%.*s\n", ACPI_NAME_SIZE, h->signature);

	return sprintf(str, "%.*s\n", ACPI_NAMESEG_SIZE, h->signature);

}



static ssize_t acpi_table_length_show(struct config_item *cfg, char *str)
@@ -170,7 +170,7 @@ static ssize_t acpi_table_asl_compiler_id_show(struct config_item *cfg, 
	if (!h)

		return -EINVAL;



	return sprintf(str, "%.*s\n", ACPI_NAME_SIZE, h->asl_compiler_id);

	return sprintf(str, "%.*s\n", ACPI_NAMESEG_SIZE, h->asl_compiler_id);

}



static ssize_t acpi_table_asl_compiler_revision_show(struct config_item *cfg,

drivers/acpi/acpica/aclocal.h

+2 −2
Original line number Diff line number Diff line
@@ -293,7 +293,7 @@ acpi_status (*acpi_internal_method) (struct acpi_walk_state * walk_state); 
 * expected_return_btypes - Allowed type(s) for the return value

 */

struct acpi_name_info {

	char name[ACPI_NAME_SIZE];

	char name[ACPI_NAMESEG_SIZE];

	u16 argument_list;

	u8 expected_btypes;

};
@@ -370,7 +370,7 @@ typedef acpi_status (*acpi_object_converter) (struct acpi_namespace_node * 
					      converted_object);



struct acpi_simple_repair_info {

	char name[ACPI_NAME_SIZE];

	char name[ACPI_NAMESEG_SIZE];

	u32 unexpected_btypes;

	u32 package_index;

	acpi_object_converter object_converter;

drivers/acpi/acpica/dbnames.c

+1 −1
Original line number Diff line number Diff line
@@ -354,7 +354,7 @@ acpi_status acpi_db_find_name_in_namespace(char *name_arg) 
	char acpi_name[5] = "____";

	char *acpi_name_ptr = acpi_name;



	if (strlen(name_arg) > ACPI_NAME_SIZE) {

	if (strlen(name_arg) > ACPI_NAMESEG_SIZE) {

		acpi_os_printf("Name must be no longer than 4 characters\n");

		return (AE_OK);

	}

drivers/acpi/acpica/evgpeinit.c

+2 −2
Original line number Diff line number Diff line
@@ -292,7 +292,7 @@ acpi_ev_match_gpe_method(acpi_handle obj_handle, 
	acpi_status status;

	u32 gpe_number;

	u8 temp_gpe_number;

	char name[ACPI_NAME_SIZE + 1];

	char name[ACPI_NAMESEG_SIZE + 1];

	u8 type;



	ACPI_FUNCTION_TRACE(ev_match_gpe_method);
@@ -310,7 +310,7 @@ acpi_ev_match_gpe_method(acpi_handle obj_handle, 
	 * 1) Extract the method name and null terminate it

	 */

	ACPI_MOVE_32_TO_32(name, &method_node->name.integer);

	name[ACPI_NAME_SIZE] = 0;

	name[ACPI_NAMESEG_SIZE] = 0;



	/* 2) Name must begin with an underscore */

drivers/acpi/acpica/exnames.c

+3 −3
Original line number Diff line number Diff line
@@ -53,10 +53,10 @@ static char *acpi_ex_allocate_name_string(u32 prefix_count, u32 num_name_segs) 


		/* Special case for root */



		size_needed = 1 + (ACPI_NAME_SIZE * num_name_segs) + 2 + 1;

		size_needed = 1 + (ACPI_NAMESEG_SIZE * num_name_segs) + 2 + 1;

	} else {

		size_needed =

		    prefix_count + (ACPI_NAME_SIZE * num_name_segs) + 2 + 1;

		    prefix_count + (ACPI_NAMESEG_SIZE * num_name_segs) + 2 + 1;

	}



	/*
@@ -141,7 +141,7 @@ static acpi_status acpi_ex_name_segment(u8 ** in_aml_address, char *name_string) 
	}



	for (index = 0;

	     (index < ACPI_NAME_SIZE)

	     (index < ACPI_NAMESEG_SIZE)

	     && (acpi_ut_valid_name_char(*aml_address, 0)); index++) {

		char_buf[index] = *aml_address++;

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE