Skip to content

Commit

Permalink
ACPICA: Fix some comment fields
Browse files Browse the repository at this point in the history
No functional change. Fixes some typos and linux divergences.

Signed-off-by: Bob Moore <robert.moore@intel.com>
Signed-off-by: Lin Ming <ming.m.lin@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
  • Loading branch information
Bob Moore authored and Len Brown committed Jul 17, 2012
1 parent 3b3ea77 commit cf48958
Show file tree
Hide file tree
Showing 9 changed files with 19 additions and 18 deletions.
4 changes: 2 additions & 2 deletions drivers/acpi/acpica/acmacros.h
Original file line number Diff line number Diff line change
Expand Up @@ -283,8 +283,8 @@
#define ACPI_INSERT_BITS(target, mask, source) target = ((target & (~(mask))) | (source & mask))

/*
* A struct acpi_namespace_node can appear in some contexts
* where a pointer to a union acpi_operand_object can also
* An object of type struct acpi_namespace_node can appear in some contexts
* where a pointer to an object of type union acpi_operand_object can also
* appear. This macro is used to distinguish them.
*
* The "Descriptor" field is the first field in both structures.
Expand Down
4 changes: 2 additions & 2 deletions drivers/acpi/acpica/acobject.h
Original file line number Diff line number Diff line change
Expand Up @@ -113,8 +113,8 @@ struct acpi_object_integer {
};

/*
* Note: The String and Buffer object must be identical through the Pointer
* and length elements. There is code that depends on this.
* Note: The String and Buffer object must be identical through the
* pointer and length elements. There is code that depends on this.
*
* Fields common to both Strings and Buffers
*/
Expand Down
4 changes: 2 additions & 2 deletions drivers/acpi/acpica/exprep.c
Original file line number Diff line number Diff line change
Expand Up @@ -395,8 +395,8 @@ acpi_ex_prep_common_field_object(union acpi_operand_object *obj_desc,
*
* RETURN: Status
*
* DESCRIPTION: Construct a union acpi_operand_object of type def_field and
* connect it to the parent Node.
* DESCRIPTION: Construct an object of type union acpi_operand_object with a
* subtype of def_field and connect it to the parent Node.
*
******************************************************************************/

Expand Down
2 changes: 1 addition & 1 deletion drivers/acpi/acpica/exresolv.c
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ acpi_ex_resolve_object_to_value(union acpi_operand_object **stack_ptr,

stack_desc = *stack_ptr;

/* This is a union acpi_operand_object */
/* This is an object of type union acpi_operand_object */

switch (stack_desc->common.type) {
case ACPI_TYPE_LOCAL_REFERENCE:
Expand Down
4 changes: 2 additions & 2 deletions drivers/acpi/acpica/exstore.c
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,8 @@ acpi_ex_store_object_to_index(union acpi_operand_object *val_desc,
* FUNCTION: acpi_ex_store
*
* PARAMETERS: *source_desc - Value to be stored
* *dest_desc - Where to store it. Must be an NS node
* or a union acpi_operand_object of type
* *dest_desc - Where to store it. Must be an NS node
* or union acpi_operand_object of type
* Reference;
* walk_state - Current walk state
*
Expand Down
2 changes: 1 addition & 1 deletion drivers/acpi/acpica/exutils.c
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ void acpi_ex_enter_interpreter(void)
*
* DESCRIPTION: Reacquire the interpreter execution region from within the
* interpreter code. Failure to enter the interpreter region is a
* fatal system error. Used in conjunction with
* fatal system error. Used in conjunction with
* relinquish_interpreter
*
******************************************************************************/
Expand Down
6 changes: 3 additions & 3 deletions drivers/acpi/acpica/rscreate.c
Original file line number Diff line number Diff line change
Expand Up @@ -190,16 +190,16 @@ acpi_rs_create_resource_list(union acpi_operand_object *aml_buffer,
*
* FUNCTION: acpi_rs_create_pci_routing_table
*
* PARAMETERS: package_object - Pointer to a union acpi_operand_object
* package
* PARAMETERS: package_object - Pointer to a package containing one
* of more ACPI_OPERAND_OBJECTs
* output_buffer - Pointer to the user's buffer
*
* RETURN: Status AE_OK if okay, else a valid acpi_status code.
* If the output_buffer is too small, the error will be
* AE_BUFFER_OVERFLOW and output_buffer->Length will point
* to the size buffer needed.
*
* DESCRIPTION: Takes the union acpi_operand_object package and creates a
* DESCRIPTION: Takes the union acpi_operand_object package and creates a
* linked list of PCI interrupt descriptions
*
* NOTE: It is the caller's responsibility to ensure that the start of the
Expand Down
5 changes: 3 additions & 2 deletions drivers/acpi/acpica/utglobal.c
Original file line number Diff line number Diff line change
Expand Up @@ -247,8 +247,9 @@ struct acpi_fixed_event_info acpi_gbl_fixed_event_info[ACPI_NUM_FIXED_EVENTS] =
*
* RETURN: Status
*
* DESCRIPTION: Init library globals. All globals that require specific
* initialization should be initialized here!
* DESCRIPTION: Initialize ACPICA globals. All globals that require specific
* initialization should be initialized here. This allows for
* a warm restart.
*
******************************************************************************/

Expand Down
6 changes: 3 additions & 3 deletions drivers/acpi/acpica/utobject.c
Original file line number Diff line number Diff line change
Expand Up @@ -327,7 +327,7 @@ union acpi_operand_object *acpi_ut_create_string_object(acpi_size string_size)
*
* RETURN: TRUE if object is valid, FALSE otherwise
*
* DESCRIPTION: Validate a pointer to be a union acpi_operand_object
* DESCRIPTION: Validate a pointer to be of type union acpi_operand_object
*
******************************************************************************/

Expand All @@ -348,7 +348,7 @@ u8 acpi_ut_valid_internal_object(void *object)
switch (ACPI_GET_DESCRIPTOR_TYPE(object)) {
case ACPI_DESC_TYPE_OPERAND:

/* The object appears to be a valid union acpi_operand_object */
/* The object appears to be a valid union acpi_operand_object */

return (TRUE);

Expand Down Expand Up @@ -419,7 +419,7 @@ void acpi_ut_delete_object_desc(union acpi_operand_object *object)
{
ACPI_FUNCTION_TRACE_PTR(ut_delete_object_desc, object);

/* Object must be a union acpi_operand_object */
/* Object must be a union acpi_operand_object */

if (ACPI_GET_DESCRIPTOR_TYPE(object) != ACPI_DESC_TYPE_OPERAND) {
ACPI_ERROR((AE_INFO,
Expand Down

0 comments on commit cf48958

Please sign in to comment.