ACPICA: Restructure includes into public/private

[safe/jmp/linux-2.6] / drivers / acpi / resources / rsutils.c

diff --git a/drivers/acpi/resources/rsutils.c b/drivers/acpi/resources/rsutils.c
index 11c0bd7..7450105 100644 (file)
--- a/drivers/acpi/resources/rsutils.c
+++ b/drivers/acpi/resources/rsutils.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2007, R. Byron Moore
+ * Copyright (C) 2000 - 2008, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -42,6 +42,7 @@
  */
 
 #include <acpi/acpi.h>
+#include <acpi/accommon.h>
 #include <acpi/acnamesp.h>
 #include <acpi/acresrc.h>
 
@@ -62,7 +63,7 @@ ACPI_MODULE_NAME("rsutils")
  ******************************************************************************/
 u8 acpi_rs_decode_bitmask(u16 mask, u8 * list)
 {
-       acpi_native_uint i;
+       u8 i;
        u8 bit_count;
 
        ACPI_FUNCTION_ENTRY();
@@ -71,7 +72,7 @@ u8 acpi_rs_decode_bitmask(u16 mask, u8 * list)
 
        for (i = 0, bit_count = 0; mask; i++) {
                if (mask & 0x0001) {
-                       list[bit_count] = (u8) i;
+                       list[bit_count] = i;
                        bit_count++;
                }
 
@@ -96,7 +97,7 @@ u8 acpi_rs_decode_bitmask(u16 mask, u8 * list)
 
 u16 acpi_rs_encode_bitmask(u8 * list, u8 count)
 {
-       acpi_native_uint i;
+       u32 i;
        u16 mask;
 
        ACPI_FUNCTION_ENTRY();
@@ -104,10 +105,10 @@ u16 acpi_rs_encode_bitmask(u8 * list, u8 count)
        /* Encode the list into a single bitmask */
 
        for (i = 0, mask = 0; i < count; i++) {
-               mask |= (0x0001 << list[i]);
+               mask |= (0x1 << list[i]);
        }
 
-       return (mask);
+       return mask;
 }
 
 /*******************************************************************************
@@ -130,7 +131,7 @@ u16 acpi_rs_encode_bitmask(u8 * list, u8 count)
 void
 acpi_rs_move_data(void *destination, void *source, u16 item_count, u8 move_type)
 {
-       acpi_native_uint i;
+       u32 i;
 
        ACPI_FUNCTION_ENTRY();
 
@@ -679,7 +680,6 @@ acpi_rs_set_srs_method_data(struct acpi_namespace_node *node,
        info->prefix_node = node;
        info->pathname = METHOD_NAME__SRS;
        info->parameters = args;
-       info->parameter_type = ACPI_PARAM_ARGS;
        info->flags = ACPI_IGNORE_RETURN_VALUE;
 
        /*