diff options
-rw-r--r-- | drivers/acpi/acpica/acmacros.h | 4 | ||||
-rw-r--r-- | drivers/acpi/acpica/acobject.h | 4 | ||||
-rw-r--r-- | drivers/acpi/acpica/exprep.c | 4 | ||||
-rw-r--r-- | drivers/acpi/acpica/exresolv.c | 2 | ||||
-rw-r--r-- | drivers/acpi/acpica/exstore.c | 4 | ||||
-rw-r--r-- | drivers/acpi/acpica/exutils.c | 2 | ||||
-rw-r--r-- | drivers/acpi/acpica/rscreate.c | 6 | ||||
-rw-r--r-- | drivers/acpi/acpica/utglobal.c | 5 | ||||
-rw-r--r-- | drivers/acpi/acpica/utobject.c | 6 |
9 files changed, 19 insertions, 18 deletions
diff --git a/drivers/acpi/acpica/acmacros.h b/drivers/acpi/acpica/acmacros.h index f119f473f71a..087b466c8ce0 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 | * A struct acpi_namespace_node can appear in some contexts | 286 | * An object of type struct acpi_namespace_node can appear in some contexts |
287 | * where a pointer to a union acpi_operand_object can also | 287 | * where a pointer to an object of type 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/acobject.h b/drivers/acpi/acpica/acobject.h index 39a2b84120be..b85802d9b247 100644 --- a/drivers/acpi/acpica/acobject.h +++ b/drivers/acpi/acpica/acobject.h | |||
@@ -113,8 +113,8 @@ struct acpi_object_integer { | |||
113 | }; | 113 | }; |
114 | 114 | ||
115 | /* | 115 | /* |
116 | * Note: The String and Buffer object must be identical through the Pointer | 116 | * Note: The String and Buffer object must be identical through the |
117 | * and length elements. There is code that depends on this. | 117 | * pointer and length elements. There is code that depends on this. |
118 | * | 118 | * |
119 | * Fields common to both Strings and Buffers | 119 | * Fields common to both Strings and Buffers |
120 | */ | 120 | */ |
diff --git a/drivers/acpi/acpica/exprep.c b/drivers/acpi/acpica/exprep.c index 30157f5a12d7..ae62038c9459 100644 --- a/drivers/acpi/acpica/exprep.c +++ b/drivers/acpi/acpica/exprep.c | |||
@@ -395,8 +395,8 @@ acpi_ex_prep_common_field_object(union acpi_operand_object *obj_desc, | |||
395 | * | 395 | * |
396 | * RETURN: Status | 396 | * RETURN: Status |
397 | * | 397 | * |
398 | * DESCRIPTION: Construct a union acpi_operand_object of type def_field and | 398 | * DESCRIPTION: Construct an object of type union acpi_operand_object with a |
399 | * connect it to the parent Node. | 399 | * subtype of def_field and connect it to the parent Node. |
400 | * | 400 | * |
401 | ******************************************************************************/ | 401 | ******************************************************************************/ |
402 | 402 | ||
diff --git a/drivers/acpi/acpica/exresolv.c b/drivers/acpi/acpica/exresolv.c index 6e335dc34528..c6f0ad436c34 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 a union acpi_operand_object */ | 150 | /* This is an object of type union acpi_operand_object */ |
151 | 151 | ||
152 | switch (stack_desc->common.type) { | 152 | switch (stack_desc->common.type) { |
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 c6cf843cc4c9..38c5048cfbe2 100644 --- a/drivers/acpi/acpica/exstore.c +++ b/drivers/acpi/acpica/exstore.c | |||
@@ -62,8 +62,8 @@ acpi_ex_store_object_to_index(union acpi_operand_object *val_desc, | |||
62 | * FUNCTION: acpi_ex_store | 62 | * FUNCTION: acpi_ex_store |
63 | * | 63 | * |
64 | * PARAMETERS: *source_desc - Value to be stored | 64 | * PARAMETERS: *source_desc - Value to be stored |
65 | * *dest_desc - Where to store it. Must be an NS node | 65 | * *dest_desc - Where to store it. Must be an NS node |
66 | * or a union acpi_operand_object of type | 66 | * or union acpi_operand_object of type |
67 | * Reference; | 67 | * Reference; |
68 | * walk_state - Current walk state | 68 | * walk_state - Current walk state |
69 | * | 69 | * |
diff --git a/drivers/acpi/acpica/exutils.c b/drivers/acpi/acpica/exutils.c index eb6798ba8b59..748240094085 100644 --- a/drivers/acpi/acpica/exutils.c +++ b/drivers/acpi/acpica/exutils.c | |||
@@ -109,7 +109,7 @@ void acpi_ex_enter_interpreter(void) | |||
109 | * | 109 | * |
110 | * DESCRIPTION: Reacquire the interpreter execution region from within the | 110 | * DESCRIPTION: Reacquire the interpreter execution region from within the |
111 | * interpreter code. Failure to enter the interpreter region is a | 111 | * interpreter code. Failure to enter the interpreter region is a |
112 | * fatal system error. Used in conjunction with | 112 | * fatal system error. Used in conjunction with |
113 | * relinquish_interpreter | 113 | * relinquish_interpreter |
114 | * | 114 | * |
115 | ******************************************************************************/ | 115 | ******************************************************************************/ |
diff --git a/drivers/acpi/acpica/rscreate.c b/drivers/acpi/acpica/rscreate.c index 46d6eb38ae66..311cbc4f05fa 100644 --- a/drivers/acpi/acpica/rscreate.c +++ b/drivers/acpi/acpica/rscreate.c | |||
@@ -190,8 +190,8 @@ acpi_rs_create_resource_list(union acpi_operand_object *aml_buffer, | |||
190 | * | 190 | * |
191 | * FUNCTION: acpi_rs_create_pci_routing_table | 191 | * FUNCTION: acpi_rs_create_pci_routing_table |
192 | * | 192 | * |
193 | * PARAMETERS: package_object - Pointer to a union acpi_operand_object | 193 | * PARAMETERS: package_object - Pointer to a package containing one |
194 | * package | 194 | * of more ACPI_OPERAND_OBJECTs |
195 | * output_buffer - Pointer to the user's buffer | 195 | * output_buffer - Pointer to the user's buffer |
196 | * | 196 | * |
197 | * RETURN: Status AE_OK if okay, else a valid acpi_status code. | 197 | * RETURN: Status AE_OK if okay, else a valid acpi_status code. |
@@ -199,7 +199,7 @@ acpi_rs_create_resource_list(union acpi_operand_object *aml_buffer, | |||
199 | * AE_BUFFER_OVERFLOW and output_buffer->Length will point | 199 | * AE_BUFFER_OVERFLOW and output_buffer->Length will point |
200 | * to the size buffer needed. | 200 | * to the size buffer needed. |
201 | * | 201 | * |
202 | * DESCRIPTION: Takes the union acpi_operand_object package and creates a | 202 | * DESCRIPTION: Takes the union acpi_operand_object package and creates a |
203 | * linked list of PCI interrupt descriptions | 203 | * linked list of PCI interrupt descriptions |
204 | * | 204 | * |
205 | * NOTE: It is the caller's responsibility to ensure that the start of the | 205 | * NOTE: It is the caller's responsibility to ensure that the start of the |
diff --git a/drivers/acpi/acpica/utglobal.c b/drivers/acpi/acpica/utglobal.c index 78cf1fe390b3..9bd5b4ce552e 100644 --- a/drivers/acpi/acpica/utglobal.c +++ b/drivers/acpi/acpica/utglobal.c | |||
@@ -247,8 +247,9 @@ struct acpi_fixed_event_info acpi_gbl_fixed_event_info[ACPI_NUM_FIXED_EVENTS] = | |||
247 | * | 247 | * |
248 | * RETURN: Status | 248 | * RETURN: Status |
249 | * | 249 | * |
250 | * DESCRIPTION: Init library globals. All globals that require specific | 250 | * DESCRIPTION: Initialize ACPICA globals. All globals that require specific |
251 | * initialization should be initialized here! | 251 | * initialization should be initialized here. This allows for |
252 | * a warm restart. | ||
252 | * | 253 | * |
253 | ******************************************************************************/ | 254 | ******************************************************************************/ |
254 | 255 | ||
diff --git a/drivers/acpi/acpica/utobject.c b/drivers/acpi/acpica/utobject.c index b112744fc9ae..d0441ca52b71 100644 --- a/drivers/acpi/acpica/utobject.c +++ b/drivers/acpi/acpica/utobject.c | |||
@@ -327,7 +327,7 @@ union acpi_operand_object *acpi_ut_create_string_object(acpi_size string_size) | |||
327 | * | 327 | * |
328 | * RETURN: TRUE if object is valid, FALSE otherwise | 328 | * RETURN: TRUE if object is valid, FALSE otherwise |
329 | * | 329 | * |
330 | * DESCRIPTION: Validate a pointer to be a union acpi_operand_object | 330 | * DESCRIPTION: Validate a pointer to be of type union acpi_operand_object |
331 | * | 331 | * |
332 | ******************************************************************************/ | 332 | ******************************************************************************/ |
333 | 333 | ||
@@ -348,7 +348,7 @@ u8 acpi_ut_valid_internal_object(void *object) | |||
348 | switch (ACPI_GET_DESCRIPTOR_TYPE(object)) { | 348 | switch (ACPI_GET_DESCRIPTOR_TYPE(object)) { |
349 | case ACPI_DESC_TYPE_OPERAND: | 349 | case ACPI_DESC_TYPE_OPERAND: |
350 | 350 | ||
351 | /* The object appears to be a valid union acpi_operand_object */ | 351 | /* The object appears to be a valid union acpi_operand_object */ |
352 | 352 | ||
353 | return (TRUE); | 353 | return (TRUE); |
354 | 354 | ||
@@ -419,7 +419,7 @@ void acpi_ut_delete_object_desc(union acpi_operand_object *object) | |||
419 | { | 419 | { |
420 | ACPI_FUNCTION_TRACE_PTR(ut_delete_object_desc, object); | 420 | ACPI_FUNCTION_TRACE_PTR(ut_delete_object_desc, object); |
421 | 421 | ||
422 | /* Object must be a union acpi_operand_object */ | 422 | /* Object must be a union acpi_operand_object */ |
423 | 423 | ||
424 | if (ACPI_GET_DESCRIPTOR_TYPE(object) != ACPI_DESC_TYPE_OPERAND) { | 424 | if (ACPI_GET_DESCRIPTOR_TYPE(object) != ACPI_DESC_TYPE_OPERAND) { |
425 | ACPI_ERROR((AE_INFO, | 425 | ACPI_ERROR((AE_INFO, |