aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/acpi/acpica
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/acpi/acpica')
-rw-r--r--drivers/acpi/acpica/acmacros.h4
-rw-r--r--drivers/acpi/acpica/exprep.c2
-rw-r--r--drivers/acpi/acpica/exresolv.c2
-rw-r--r--drivers/acpi/acpica/exstore.c2
-rw-r--r--drivers/acpi/acpica/rscreate.c2
-rw-r--r--drivers/acpi/acpica/utobject.c4
6 files changed, 8 insertions, 8 deletions
diff --git a/drivers/acpi/acpica/acmacros.h b/drivers/acpi/acpica/acmacros.h
index c57286a3aceb..9c127e8e2d6d 100644
--- a/drivers/acpi/acpica/acmacros.h
+++ b/drivers/acpi/acpica/acmacros.h
@@ -283,8 +283,8 @@
283#define ACPI_INSERT_BITS(target, mask, source) target = ((target & (~(mask))) | (source & mask)) 283#define ACPI_INSERT_BITS(target, mask, source) target = ((target & (~(mask))) | (source & mask))
284 284
285/* 285/*
286 * An struct acpi_namespace_node can appear in some contexts 286 * A struct acpi_namespace_node can appear in some contexts
287 * where a pointer to an union acpi_operand_object can also 287 * where a pointer to a union acpi_operand_object can also
288 * appear. This macro is used to distinguish them. 288 * appear. This macro is used to distinguish them.
289 * 289 *
290 * The "Descriptor" field is the first field in both structures. 290 * The "Descriptor" field is the first field in both structures.
diff --git a/drivers/acpi/acpica/exprep.c b/drivers/acpi/acpica/exprep.c
index 33c66eb3ae39..a226f74d4a5c 100644
--- a/drivers/acpi/acpica/exprep.c
+++ b/drivers/acpi/acpica/exprep.c
@@ -405,7 +405,7 @@ acpi_ex_prep_common_field_object(union acpi_operand_object *obj_desc,
405 * 405 *
406 * RETURN: Status 406 * RETURN: Status
407 * 407 *
408 * DESCRIPTION: Construct an union acpi_operand_object of type def_field and 408 * DESCRIPTION: Construct a union acpi_operand_object of type def_field and
409 * connect it to the parent Node. 409 * connect it to the parent Node.
410 * 410 *
411 ******************************************************************************/ 411 ******************************************************************************/
diff --git a/drivers/acpi/acpica/exresolv.c b/drivers/acpi/acpica/exresolv.c
index 3673d2b2c4ac..f6105a6d6126 100644
--- a/drivers/acpi/acpica/exresolv.c
+++ b/drivers/acpi/acpica/exresolv.c
@@ -147,7 +147,7 @@ acpi_ex_resolve_object_to_value(union acpi_operand_object **stack_ptr,
147 147
148 stack_desc = *stack_ptr; 148 stack_desc = *stack_ptr;
149 149
150 /* This is an union acpi_operand_object */ 150 /* This is a union acpi_operand_object */
151 151
152 switch (ACPI_GET_OBJECT_TYPE(stack_desc)) { 152 switch (ACPI_GET_OBJECT_TYPE(stack_desc)) {
153 case ACPI_TYPE_LOCAL_REFERENCE: 153 case ACPI_TYPE_LOCAL_REFERENCE:
diff --git a/drivers/acpi/acpica/exstore.c b/drivers/acpi/acpica/exstore.c
index 7c6d7e53e41e..e35e9b4f6a4e 100644
--- a/drivers/acpi/acpica/exstore.c
+++ b/drivers/acpi/acpica/exstore.c
@@ -275,7 +275,7 @@ acpi_ex_do_debug_object(union acpi_operand_object *source_desc,
275 * 275 *
276 * PARAMETERS: *source_desc - Value to be stored 276 * PARAMETERS: *source_desc - Value to be stored
277 * *dest_desc - Where to store it. Must be an NS node 277 * *dest_desc - Where to store it. Must be an NS node
278 * or an union acpi_operand_object of type 278 * or a union acpi_operand_object of type
279 * Reference; 279 * Reference;
280 * walk_state - Current walk state 280 * walk_state - Current walk state
281 * 281 *
diff --git a/drivers/acpi/acpica/rscreate.c b/drivers/acpi/acpica/rscreate.c
index 9eb3a2a68408..61566b1a0616 100644
--- a/drivers/acpi/acpica/rscreate.c
+++ b/drivers/acpi/acpica/rscreate.c
@@ -125,7 +125,7 @@ acpi_rs_create_resource_list(union acpi_operand_object *aml_buffer,
125 * 125 *
126 * FUNCTION: acpi_rs_create_pci_routing_table 126 * FUNCTION: acpi_rs_create_pci_routing_table
127 * 127 *
128 * PARAMETERS: package_object - Pointer to an union acpi_operand_object 128 * PARAMETERS: package_object - Pointer to a union acpi_operand_object
129 * package 129 * package
130 * output_buffer - Pointer to the user's buffer 130 * output_buffer - Pointer to the user's buffer
131 * 131 *
diff --git a/drivers/acpi/acpica/utobject.c b/drivers/acpi/acpica/utobject.c
index 4279ed3a8782..fd5ea7543e5b 100644
--- a/drivers/acpi/acpica/utobject.c
+++ b/drivers/acpi/acpica/utobject.c
@@ -298,7 +298,7 @@ union acpi_operand_object *acpi_ut_create_string_object(acpi_size string_size)
298 * 298 *
299 * RETURN: TRUE if object is valid, FALSE otherwise 299 * RETURN: TRUE if object is valid, FALSE otherwise
300 * 300 *
301 * DESCRIPTION: Validate a pointer to be an union acpi_operand_object 301 * DESCRIPTION: Validate a pointer to be a union acpi_operand_object
302 * 302 *
303 ******************************************************************************/ 303 ******************************************************************************/
304 304
@@ -390,7 +390,7 @@ void acpi_ut_delete_object_desc(union acpi_operand_object *object)
390{ 390{
391 ACPI_FUNCTION_TRACE_PTR(ut_delete_object_desc, object); 391 ACPI_FUNCTION_TRACE_PTR(ut_delete_object_desc, object);
392 392
393 /* Object must be an union acpi_operand_object */ 393 /* Object must be a union acpi_operand_object */
394 394
395 if (ACPI_GET_DESCRIPTOR_TYPE(object) != ACPI_DESC_TYPE_OPERAND) { 395 if (ACPI_GET_DESCRIPTOR_TYPE(object) != ACPI_DESC_TYPE_OPERAND) {
396 ACPI_ERROR((AE_INFO, 396 ACPI_ERROR((AE_INFO,