disable FB

hc

2024-01-04 1543e317f1da31b75942316931e8f491a8920811

 kernel/drivers/acpi/acpica/nsutils.c
..
..
@@ -4,7 +4,7 @@
4
4
  * Module Name: nsutils - Utilities for accessing ACPI namespace, accessing
5
5
  *                        parents and siblings and Scope manipulation
6
6
  *
7
- * Copyright (C) 2000 - 2018, Intel Corp.
7
+ * Copyright (C) 2000 - 2020, Intel Corp.
8
8
  *
9
9
  *****************************************************************************/
10
10
 
..
..
@@ -178,7 +178,7 @@
178
178
 		}
179
179
 	}
180
180
 
181
-	info->length = (ACPI_NAME_SIZE * info->num_segments) +
181
+	info->length = (ACPI_NAMESEG_SIZE * info->num_segments) +
182
182
 	    4 + info->num_carats;
183
183
 
184
184
 	info->next_external_char = next_external_char;
..
..
@@ -249,7 +249,7 @@
249
249
 	/* Build the name (minus path separators) */
250
250
 
251
251
 	for (; num_segments; num_segments--) {
252
-		for (i = 0; i < ACPI_NAME_SIZE; i++) {
252
+		for (i = 0; i < ACPI_NAMESEG_SIZE; i++) {
253
253
 			if (ACPI_IS_PATH_SEPARATOR(*external_name) ||
254
254
 			    (*external_name == 0)) {
255
255
 
..
..
@@ -274,7 +274,7 @@
274
274
 		/* Move on the next segment */
275
275
 
276
276
 		external_name++;
277
-		result += ACPI_NAME_SIZE;
277
+		result += ACPI_NAMESEG_SIZE;
278
278
 	}
279
279
 
280
280
 	/* Terminate the string */
..
..
@@ -350,7 +350,7 @@
350
350
  *
351
351
  * FUNCTION:    acpi_ns_externalize_name
352
352
  *
353
- * PARAMETERS:  internal_name_length - Lenth of the internal name below
353
+ * PARAMETERS:  internal_name_length - Length of the internal name below
354
354
  *              internal_name       - Internal representation of name
355
355
  *              converted_name_length - Where the length is returned
356
356
  *              converted_name      - Where the resulting external name
..
..
@@ -489,12 +489,12 @@
489
489
 
490
490
 			/* Copy and validate the 4-char name segment */
491
491
 
492
-			ACPI_MOVE_NAME(&(*converted_name)[j],
493
-				       &internal_name[names_index]);
492
+			ACPI_COPY_NAMESEG(&(*converted_name)[j],
493
+					  &internal_name[names_index]);
494
494
 			acpi_ut_repair_name(&(*converted_name)[j]);
495
495
 
496
-			j += ACPI_NAME_SIZE;
497
-			names_index += ACPI_NAME_SIZE;
496
+			j += ACPI_NAMESEG_SIZE;
497
+			names_index += ACPI_NAMESEG_SIZE;
498
498
 		}
499
499
 	}
500
500
 
..
..
@@ -560,20 +560,8 @@
560
560
 void acpi_ns_terminate(void)
561
561
 {
562
562
 	acpi_status status;
563
-	union acpi_operand_object *prev;
564
-	union acpi_operand_object *next;
565
563
 
566
564
 	ACPI_FUNCTION_TRACE(ns_terminate);
567
-
568
-	/* Delete any module-level code blocks */
569
-
570
-	next = acpi_gbl_module_code_list;
571
-	while (next) {
572
-		prev = next;
573
-		next = next->method.mutex;
574
-		prev->method.mutex = NULL;	/* Clear the Mutex (cheated) field */
575
-		acpi_ut_remove_reference(prev);
576
-	}
577
565
 
578
566
 	/*
579
567
 	 * Free the entire namespace -- all nodes and all objects