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

ACPICA: Update interface to acpi_ut_valid_acpi_name() 



Clean up the interface by making the input argument a char *
string instead of a UINT32 name. This is easier to use for all
callers and eliminates casting to *(UINT32*)

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 7cec7048

drivers/acpi/acpica/acutils.h

+1 −1
Original line number Diff line number Diff line
@@ -620,7 +620,7 @@ void acpi_ut_print_string(char *string, u8 max_length); 


void ut_convert_backslashes(char *pathname);



u8 acpi_ut_valid_acpi_name(u32 name);

u8 acpi_ut_valid_acpi_name(char *name);



u8 acpi_ut_valid_acpi_char(char character, u32 position);

drivers/acpi/acpica/tbinstal.c

+1 −2
Original line number Diff line number Diff line
@@ -141,8 +141,7 @@ acpi_tb_add_table(struct acpi_table_desc *table_desc, u32 *table_index) 
		ACPI_BIOS_ERROR((AE_INFO,

				 "Table has invalid signature [%4.4s] (0x%8.8X), "

				 "must be SSDT or OEMx",

				 acpi_ut_valid_acpi_name(*(u32 *)table_desc->

							 pointer->

				 acpi_ut_valid_acpi_name(table_desc->pointer->

							 signature) ?

				 table_desc->pointer->signature : "????",

				 *(u32 *)table_desc->pointer->signature));

drivers/acpi/acpica/utstring.c

+4 −4
Original line number Diff line number Diff line
@@ -462,7 +462,8 @@ u8 acpi_ut_valid_acpi_char(char character, u32 position) 
 *

 * FUNCTION:    acpi_ut_valid_acpi_name

 *

 * PARAMETERS:  name            - The name to be examined

 * PARAMETERS:  name            - The name to be examined. Does not have to

 *                                be NULL terminated string.

 *

 * RETURN:      TRUE if the name is valid, FALSE otherwise

 *
@@ -473,15 +474,14 @@ u8 acpi_ut_valid_acpi_char(char character, u32 position) 
 *

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



u8 acpi_ut_valid_acpi_name(u32 name)

u8 acpi_ut_valid_acpi_name(char *name)

{

	u32 i;



	ACPI_FUNCTION_ENTRY();



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

		if (!acpi_ut_valid_acpi_char

		    ((ACPI_CAST_PTR(char, &name))[i], i)) {

		if (!acpi_ut_valid_acpi_char(name[i], i)) {

			return (FALSE);

		}

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE