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

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

ACPICA: Eliminate some small unnecessary pathname functions. 



Removed several small pathname functions to increase efficiency.
Essentially, they replace a function call with a single compare.

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 528a412c

drivers/acpi/acpica/acmacros.h

+6 −0
Original line number Diff line number Diff line
@@ -311,6 +311,12 @@ 
#define ACPI_EXTRACT_3BIT_FLAG(field, position)     (ACPI_GET_3BIT_FLAG ((field) >> position))

#define ACPI_EXTRACT_4BIT_FLAG(field, position)     (ACPI_GET_4BIT_FLAG ((field) >> position))



/* ACPI Pathname helpers */



#define ACPI_IS_ROOT_PREFIX(c)      ((c) == (u8) 0x5C)	/* Backslash */

#define ACPI_IS_PARENT_PREFIX(c)    ((c) == (u8) 0x5E)	/* Carat */

#define ACPI_IS_PATH_SEPARATOR(c)   ((c) == (u8) 0x2E)	/* Period (dot) */



/*

 * An object of type struct acpi_namespace_node can appear in some contexts

 * where a pointer to an object of type union acpi_operand_object can also

drivers/acpi/acpica/acnamesp.h

+0 −2
Original line number Diff line number Diff line
@@ -333,8 +333,6 @@ acpi_ns_install_node(struct acpi_walk_state *walk_state, 
/*

 * nsutils - Utility functions

 */

u8 acpi_ns_valid_root_prefix(char prefix);



acpi_object_type acpi_ns_get_type(struct acpi_namespace_node *node);



u32 acpi_ns_local(acpi_object_type type);

drivers/acpi/acpica/acparser.h

+0 −2
Original line number Diff line number Diff line
@@ -211,8 +211,6 @@ void acpi_ps_free_op(union acpi_parse_object *op); 


u8 acpi_ps_is_leading_char(u32 c);



u8 acpi_ps_is_prefix_char(u32 c);



#ifdef	ACPI_FUTURE_USAGE

u32 acpi_ps_get_name(union acpi_parse_object *op);

#endif				/* ACPI_FUTURE_USAGE */

drivers/acpi/acpica/nsutils.c

+11 −49
Original line number Diff line number Diff line
@@ -51,8 +51,6 @@ 
ACPI_MODULE_NAME("nsutils")



/* Local prototypes */

static u8 acpi_ns_valid_path_separator(char sep);



#ifdef ACPI_OBSOLETE_FUNCTIONS

acpi_name acpi_ns_find_parent_name(struct acpi_namespace_node *node_to_search);

#endif
@@ -96,42 +94,6 @@ acpi_ns_print_node_pathname(struct acpi_namespace_node *node, 
	}

}



/*******************************************************************************

 *

 * FUNCTION:    acpi_ns_valid_root_prefix

 *

 * PARAMETERS:  prefix          - Character to be checked

 *

 * RETURN:      TRUE if a valid prefix

 *

 * DESCRIPTION: Check if a character is a valid ACPI Root prefix

 *

 ******************************************************************************/



u8 acpi_ns_valid_root_prefix(char prefix)

{



	return ((u8)(prefix == '\\'));

}



/*******************************************************************************

 *

 * FUNCTION:    acpi_ns_valid_path_separator

 *

 * PARAMETERS:  sep         - Character to be checked

 *

 * RETURN:      TRUE if a valid path separator

 *

 * DESCRIPTION: Check if a character is a valid ACPI path separator

 *

 ******************************************************************************/



static u8 acpi_ns_valid_path_separator(char sep)

{



	return ((u8)(sep == '.'));

}



/*******************************************************************************

 *

 * FUNCTION:    acpi_ns_get_type
@@ -217,19 +179,19 @@ void acpi_ns_get_internal_name_length(struct acpi_namestring_info *info) 
	 *

	 * strlen() + 1 covers the first name_seg, which has no path separator

	 */

	if (acpi_ns_valid_root_prefix(*next_external_char)) {

	if (ACPI_IS_ROOT_PREFIX(*next_external_char)) {

		info->fully_qualified = TRUE;

		next_external_char++;



		/* Skip redundant root_prefix, like \\_SB.PCI0.SBRG.EC0 */



		while (acpi_ns_valid_root_prefix(*next_external_char)) {

		while (ACPI_IS_ROOT_PREFIX(*next_external_char)) {

			next_external_char++;

		}

	} else {

		/* Handle Carat prefixes */



		while (*next_external_char == '^') {

		while (ACPI_IS_PARENT_PREFIX(*next_external_char)) {

			info->num_carats++;

			next_external_char++;

		}
@@ -243,7 +205,7 @@ void acpi_ns_get_internal_name_length(struct acpi_namestring_info *info) 
	if (*next_external_char) {

		info->num_segments = 1;

		for (i = 0; next_external_char[i]; i++) {

			if (acpi_ns_valid_path_separator(next_external_char[i])) {

			if (ACPI_IS_PATH_SEPARATOR(next_external_char[i])) {

				info->num_segments++;

			}

		}
@@ -281,7 +243,7 @@ acpi_status acpi_ns_build_internal_name(struct acpi_namestring_info *info) 
	/* Setup the correct prefixes, counts, and pointers */



	if (info->fully_qualified) {

		internal_name[0] = '\\';

		internal_name[0] = AML_ROOT_PREFIX;



		if (num_segments <= 1) {

			result = &internal_name[1];
@@ -301,7 +263,7 @@ acpi_status acpi_ns_build_internal_name(struct acpi_namestring_info *info) 
		i = 0;

		if (info->num_carats) {

			for (i = 0; i < info->num_carats; i++) {

				internal_name[i] = '^';

				internal_name[i] = AML_PARENT_PREFIX;

			}

		}
@@ -321,7 +283,7 @@ acpi_status acpi_ns_build_internal_name(struct acpi_namestring_info *info) 


	for (; num_segments; num_segments--) {

		for (i = 0; i < ACPI_NAME_SIZE; i++) {

			if (acpi_ns_valid_path_separator(*external_name) ||

			if (ACPI_IS_PATH_SEPARATOR(*external_name) ||

			    (*external_name == 0)) {



				/* Pad the segment with underscore(s) if segment is short */
@@ -338,7 +300,7 @@ acpi_status acpi_ns_build_internal_name(struct acpi_namestring_info *info) 


		/* Now we must have a path separator, or the pathname is bad */



		if (!acpi_ns_valid_path_separator(*external_name) &&

		if (!ACPI_IS_PATH_SEPARATOR(*external_name) &&

		    (*external_name != 0)) {

			return_ACPI_STATUS(AE_BAD_PATHNAME);

		}
@@ -456,13 +418,13 @@ acpi_ns_externalize_name(u32 internal_name_length, 
	/* Check for a prefix (one '\' | one or more '^') */



	switch (internal_name[0]) {

	case '\\':

	case AML_ROOT_PREFIX:

		prefix_length = 1;

		break;



	case '^':

	case AML_PARENT_PREFIX:

		for (i = 0; i < internal_name_length; i++) {

			if (internal_name[i] == '^') {

			if (ACPI_IS_PARENT_PREFIX(internal_name[i])) {

				prefix_length = i + 1;

			} else {

				break;

drivers/acpi/acpica/nsxfeval.c

+1 −1
Original line number Diff line number Diff line
@@ -236,7 +236,7 @@ acpi_evaluate_object(acpi_handle handle, 
	 * 2) No handle, not fully qualified pathname (error)

	 * 3) Valid handle

	 */

	if ((pathname) && (acpi_ns_valid_root_prefix(pathname[0]))) {

	if ((pathname) && (ACPI_IS_ROOT_PREFIX(pathname[0]))) {



		/* The path is fully qualified, just evaluate by name */