disable FB

hc

2024-01-04 1543e317f1da31b75942316931e8f491a8920811

 kernel/drivers/acpi/acpica/utpredef.c
..
..
@@ -3,7 +3,7 @@
3
3
  *
4
4
  * Module Name: utpredef - support functions for predefined names
5
5
  *
6
- * Copyright (C) 2000 - 2018, Intel Corp.
6
+ * Copyright (C) 2000 - 2020, Intel Corp.
7
7
  *
8
8
  *****************************************************************************/
9
9
 
..
..
@@ -84,7 +84,7 @@
84
84
 
85
85
 	this_name = acpi_gbl_predefined_methods;
86
86
 	while (this_name->info.name[0]) {
87
-		if (ACPI_COMPARE_NAME(name, this_name->info.name)) {
87
+		if (ACPI_COMPARE_NAMESEG(name, this_name->info.name)) {
88
88
 			return (this_name);
89
89
 		}
90
90
 
..
..
@@ -151,7 +151,7 @@
151
151
 
152
152
 static const char *ut_external_type_names[] =	/* Indexed by ACPI_TYPE_* */
153
153
 {
154
-	", UNSUPPORTED-TYPE",
154
+	", Type_ANY",
155
155
 	", Integer",
156
156
 	", String",
157
157
 	", Buffer",
..
..
@@ -201,7 +201,7 @@
201
201
 
202
202
 	this_name = acpi_gbl_resource_names;
203
203
 	while (this_name->info.name[0]) {
204
-		if (ACPI_COMPARE_NAME(name, this_name->info.name)) {
204
+		if (ACPI_COMPARE_NAMESEG(name, this_name->info.name)) {
205
205
 			return (this_name);
206
206
 		}
207
207
 
..
..
@@ -311,8 +311,7 @@
311
311
 	for (i = 0; i < arg_count; i++) {
312
312
 		this_argument_type = METHOD_GET_NEXT_TYPE(argument_types);
313
313
 
314
-		if (!this_argument_type
315
-		    || (this_argument_type > METHOD_MAX_ARG_TYPE)) {
314
+		if (this_argument_type > METHOD_MAX_ARG_TYPE) {
316
315
 			printf("**** Invalid argument type (%u) "
317
316
 			       "in predefined info structure\n",
318
317
 			       this_argument_type);