Skip to content

Commit

Permalink
ACPICA: Fix miscellaneous warnings under gcc 4+
Browse files Browse the repository at this point in the history
Some possible warnings with gcc 4+, especially with extended warnings
enabled

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 May 27, 2009
1 parent e4c1ebf commit ba9c3f5
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 6 deletions.
5 changes: 3 additions & 2 deletions drivers/acpi/acpica/dsobject.c
Original file line number Diff line number Diff line change
Expand Up @@ -734,7 +734,8 @@ acpi_ds_init_object_from_op(struct acpi_walk_state *walk_state,

/* Local ID (0-7) is (AML opcode - base AML_LOCAL_OP) */

obj_desc->reference.value = opcode - AML_LOCAL_OP;
obj_desc->reference.value =
((u32)opcode) - AML_LOCAL_OP;
obj_desc->reference.class = ACPI_REFCLASS_LOCAL;

#ifndef ACPI_NO_METHOD_EXECUTION
Expand All @@ -754,7 +755,7 @@ acpi_ds_init_object_from_op(struct acpi_walk_state *walk_state,

/* Arg ID (0-6) is (AML opcode - base AML_ARG_OP) */

obj_desc->reference.value = opcode - AML_ARG_OP;
obj_desc->reference.value = ((u32)opcode) - AML_ARG_OP;
obj_desc->reference.class = ACPI_REFCLASS_ARG;

#ifndef ACPI_NO_METHOD_EXECUTION
Expand Down
4 changes: 2 additions & 2 deletions drivers/acpi/acpica/dswstate.c
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ acpi_ds_result_pop(union acpi_operand_object **object,
/* Return object of the top element and clean that top element result stack */

walk_state->result_count--;
index = walk_state->result_count % ACPI_RESULTS_FRAME_OBJ_NUM;
index = (u32)walk_state->result_count % ACPI_RESULTS_FRAME_OBJ_NUM;

*object = state->results.obj_desc[index];
if (!*object) {
Expand Down Expand Up @@ -186,7 +186,7 @@ acpi_ds_result_push(union acpi_operand_object * object,

/* Assign the address of object to the top free element of result stack */

index = walk_state->result_count % ACPI_RESULTS_FRAME_OBJ_NUM;
index = (u32)walk_state->result_count % ACPI_RESULTS_FRAME_OBJ_NUM;
state->results.obj_desc[index] = object;
walk_state->result_count++;

Expand Down
8 changes: 6 additions & 2 deletions drivers/acpi/acpica/rsxface.c
Original file line number Diff line number Diff line change
Expand Up @@ -338,13 +338,17 @@ acpi_resource_to_address64(struct acpi_resource *resource,
switch (resource->type) {
case ACPI_RESOURCE_TYPE_ADDRESS16:

address16 = (struct acpi_resource_address16 *)&resource->data;
address16 =
ACPI_CAST_PTR(struct acpi_resource_address16,
&resource->data);
ACPI_COPY_ADDRESS(out, address16);
break;

case ACPI_RESOURCE_TYPE_ADDRESS32:

address32 = (struct acpi_resource_address32 *)&resource->data;
address32 =
ACPI_CAST_PTR(struct acpi_resource_address32,
&resource->data);
ACPI_COPY_ADDRESS(out, address32);
break;

Expand Down

0 comments on commit ba9c3f5

Please sign in to comment.