Merge HEAD from ../from-linus
[powerpc.git] / drivers / acpi / resources / rsaddr.c
index 4788c07..4cf46e1 100644 (file)
  * POSSIBILITY OF SUCH DAMAGES.
  */
 
-
 #include <acpi/acpi.h>
 #include <acpi/acresrc.h>
 
 #define _COMPONENT          ACPI_RESOURCES
-        ACPI_MODULE_NAME    ("rsaddr")
-
+ACPI_MODULE_NAME("rsaddr")
 
 /*******************************************************************************
  *
  *              number of bytes consumed from the byte stream.
  *
  ******************************************************************************/
-
 acpi_status
-acpi_rs_address16_resource (
-       u8                              *byte_stream_buffer,
-       acpi_size                       *bytes_consumed,
-       u8                              **output_buffer,
-       acpi_size                       *structure_size)
+acpi_rs_address16_resource(u8 * byte_stream_buffer,
+                          acpi_size * bytes_consumed,
+                          u8 ** output_buffer, acpi_size * structure_size)
 {
-       u8                              *buffer = byte_stream_buffer;
-       struct acpi_resource            *output_struct = (void *) *output_buffer;
-       u8                              *temp_ptr;
-       acpi_size                       struct_size = ACPI_SIZEOF_RESOURCE (struct acpi_resource_address16);
-       u32                             index;
-       u16                             temp16;
-       u8                              temp8;
+       u32 index;
+       u16 temp16;
+       u8 temp8;
+       u8 *temp_ptr;
+       u8 *buffer = byte_stream_buffer;
+       struct acpi_resource *output_struct = (void *)*output_buffer;
+       acpi_size struct_size =
+           ACPI_SIZEOF_RESOURCE(struct acpi_resource_address16);
 
+       ACPI_FUNCTION_TRACE("rs_address16_resource");
 
-       ACPI_FUNCTION_TRACE ("rs_address16_resource");
+       /* Point past the Descriptor to get the number of bytes consumed */
 
-
-       /*
-        * Point past the Descriptor to get the number of bytes consumed
-        */
        buffer += 1;
-       ACPI_MOVE_16_TO_16 (&temp16, buffer);
+       ACPI_MOVE_16_TO_16(&temp16, buffer);
 
        /* Validate minimum descriptor length */
 
        if (temp16 < 13) {
-               return_ACPI_STATUS (AE_AML_BAD_RESOURCE_LENGTH);
+               return_ACPI_STATUS(AE_AML_BAD_RESOURCE_LENGTH);
        }
 
        *bytes_consumed = temp16 + 3;
        output_struct->id = ACPI_RSTYPE_ADDRESS16;
 
-       /*
-        * Get the Resource Type (Byte3)
-        */
+       /* Get the Resource Type (Byte3) */
+
        buffer += 2;
        temp8 = *buffer;
 
        /* Values 0-2 and 0xC0-0xFF are valid */
 
        if ((temp8 > 2) && (temp8 < 0xC0)) {
-               return_ACPI_STATUS (AE_AML_INVALID_RESOURCE_TYPE);
+               return_ACPI_STATUS(AE_AML_INVALID_RESOURCE_TYPE);
        }
 
        output_struct->data.address16.resource_type = temp8;
 
-       /*
-        * Get the General Flags (Byte4)
-        */
+       /* Get the General Flags (Byte4) */
+
        buffer += 1;
        temp8 = *buffer;
 
@@ -140,64 +131,60 @@ acpi_rs_address16_resource (
 
        output_struct->data.address16.max_address_fixed = (temp8 >> 3) & 0x01;
 
-       /*
-        * Get the Type Specific Flags (Byte5)
-        */
+       /* Get the Type Specific Flags (Byte5) */
+
        buffer += 1;
        temp8 = *buffer;
 
        if (ACPI_MEMORY_RANGE == output_struct->data.address16.resource_type) {
-               output_struct->data.address16.attribute.memory.read_write_attribute =
-                               (u16) (temp8 & 0x01);
+               output_struct->data.address16.attribute.memory.
+                   read_write_attribute = (u16) (temp8 & 0x01);
                output_struct->data.address16.attribute.memory.cache_attribute =
-                               (u16) ((temp8 >> 1) & 0x03);
-       }
-       else {
-               if (ACPI_IO_RANGE == output_struct->data.address16.resource_type) {
-                       output_struct->data.address16.attribute.io.range_attribute =
-                               (u16) (temp8 & 0x03);
-                       output_struct->data.address16.attribute.io.translation_attribute =
-                               (u16) ((temp8 >> 4) & 0x03);
-               }
-               else {
+                   (u16) ((temp8 >> 1) & 0x03);
+       } else {
+               if (ACPI_IO_RANGE ==
+                   output_struct->data.address16.resource_type) {
+                       output_struct->data.address16.attribute.io.
+                           range_attribute = (u16) (temp8 & 0x03);
+                       output_struct->data.address16.attribute.io.
+                           translation_attribute = (u16) ((temp8 >> 4) & 0x03);
+               } else {
                        /* BUS_NUMBER_RANGE == Address16.Data->resource_type */
                        /* Nothing needs to be filled in */
                }
        }
 
-       /*
-        * Get Granularity (Bytes 6-7)
-        */
+       /* Get Granularity (Bytes 6-7) */
+
        buffer += 1;
-       ACPI_MOVE_16_TO_32 (&output_struct->data.address16.granularity, buffer);
+       ACPI_MOVE_16_TO_32(&output_struct->data.address16.granularity, buffer);
+
+       /* Get min_address_range (Bytes 8-9) */
 
-       /*
-        * Get min_address_range (Bytes 8-9)
-        */
        buffer += 2;
-       ACPI_MOVE_16_TO_32 (&output_struct->data.address16.min_address_range, buffer);
+       ACPI_MOVE_16_TO_32(&output_struct->data.address16.min_address_range,
+                          buffer);
+
+       /* Get max_address_range (Bytes 10-11) */
 
-       /*
-        * Get max_address_range (Bytes 10-11)
-        */
        buffer += 2;
-       ACPI_MOVE_16_TO_32 (&output_struct->data.address16.max_address_range, buffer);
+       ACPI_MOVE_16_TO_32(&output_struct->data.address16.max_address_range,
+                          buffer);
+
+       /* Get address_translation_offset (Bytes 12-13) */
 
-       /*
-        * Get address_translation_offset (Bytes 12-13)
-        */
        buffer += 2;
-       ACPI_MOVE_16_TO_32 (&output_struct->data.address16.address_translation_offset, buffer);
+       ACPI_MOVE_16_TO_32(&output_struct->data.address16.
+                          address_translation_offset, buffer);
+
+       /* Get address_length (Bytes 14-15) */
 
-       /*
-        * Get address_length (Bytes 14-15)
-        */
        buffer += 2;
-       ACPI_MOVE_16_TO_32 (&output_struct->data.address16.address_length, buffer);
+       ACPI_MOVE_16_TO_32(&output_struct->data.address16.address_length,
+                          buffer);
+
+       /* Resource Source Index (if present) */
 
-       /*
-        * Resource Source Index (if present)
-        */
        buffer += 2;
 
        /*
@@ -214,7 +201,8 @@ acpi_rs_address16_resource (
                /* Dereference the Index */
 
                temp8 = *buffer;
-               output_struct->data.address16.resource_source.index = (u32) temp8;
+               output_struct->data.address16.resource_source.index =
+                   (u32) temp8;
 
                /* Point to the String */
 
@@ -223,9 +211,10 @@ acpi_rs_address16_resource (
                /* Point the String pointer to the end of this structure */
 
                output_struct->data.address16.resource_source.string_ptr =
-                               (char *)((u8 * )output_struct + struct_size);
+                   (char *)((u8 *) output_struct + struct_size);
 
-               temp_ptr = (u8 *) output_struct->data.address16.resource_source.string_ptr;
+               temp_ptr = (u8 *)
+                   output_struct->data.address16.resource_source.string_ptr;
 
                /* Copy the string into the buffer */
 
@@ -239,12 +228,12 @@ acpi_rs_address16_resource (
                        index += 1;
                }
 
-               /*
-                * Add the terminating null
-                */
+               /* Add the terminating null */
+
                *temp_ptr = 0x00;
 
-               output_struct->data.address16.resource_source.string_length = index + 1;
+               output_struct->data.address16.resource_source.string_length =
+                   index + 1;
 
                /*
                 * In order for the struct_size to fall on a 32-bit boundary,
@@ -252,27 +241,23 @@ acpi_rs_address16_resource (
                 * struct_size to the next 32-bit boundary.
                 */
                temp8 = (u8) (index + 1);
-               struct_size += ACPI_ROUND_UP_to_32_bITS (temp8);
-       }
-       else {
+               struct_size += ACPI_ROUND_UP_to_32_bITS(temp8);
+       } else {
                output_struct->data.address16.resource_source.index = 0x00;
                output_struct->data.address16.resource_source.string_length = 0;
                output_struct->data.address16.resource_source.string_ptr = NULL;
        }
 
-       /*
-        * Set the Length parameter
-        */
+       /* Set the Length parameter */
+
        output_struct->length = (u32) struct_size;
 
-       /*
-        * Return the final size of the structure
-        */
+       /* Return the final size of the structure */
+
        *structure_size = struct_size;
-       return_ACPI_STATUS (AE_OK);
+       return_ACPI_STATUS(AE_OK);
 }
 
-
 /*******************************************************************************
  *
  * FUNCTION:    acpi_rs_address16_stream
@@ -290,43 +275,35 @@ acpi_rs_address16_resource (
  ******************************************************************************/
 
 acpi_status
-acpi_rs_address16_stream (
-       struct acpi_resource            *linked_list,
-       u8                              **output_buffer,
-       acpi_size                       *bytes_consumed)
+acpi_rs_address16_stream(struct acpi_resource *linked_list,
+                        u8 ** output_buffer, acpi_size * bytes_consumed)
 {
-       u8                              *buffer = *output_buffer;
-       u8                              *length_field;
-       u8                              temp8;
-       char                            *temp_pointer = NULL;
-       acpi_size                       actual_bytes;
+       u8 *buffer = *output_buffer;
+       u8 *length_field;
+       u8 temp8;
+       char *temp_pointer = NULL;
+       acpi_size actual_bytes;
 
+       ACPI_FUNCTION_TRACE("rs_address16_stream");
 
-       ACPI_FUNCTION_TRACE ("rs_address16_stream");
+       /* The descriptor field is static */
 
-
-       /*
-        * The descriptor field is static
-        */
        *buffer = 0x88;
        buffer += 1;
 
-       /*
-        * Save a pointer to the Length field - to be filled in later
-        */
+       /* Save a pointer to the Length field - to be filled in later */
+
        length_field = buffer;
        buffer += 2;
 
-       /*
-        * Set the Resource Type (Memory, Io, bus_number)
-        */
+       /* Set the Resource Type (Memory, Io, bus_number) */
+
        temp8 = (u8) (linked_list->data.address16.resource_type & 0x03);
        *buffer = temp8;
        buffer += 1;
 
-       /*
-        * Set the general flags
-        */
+       /* Set the general flags */
+
        temp8 = (u8) (linked_list->data.address16.producer_consumer & 0x01);
 
        temp8 |= (linked_list->data.address16.decode & 0x01) << 1;
@@ -336,90 +313,88 @@ acpi_rs_address16_stream (
        *buffer = temp8;
        buffer += 1;
 
-       /*
-        * Set the type specific flags
-        */
+       /* Set the type specific flags */
+
        temp8 = 0;
 
        if (ACPI_MEMORY_RANGE == linked_list->data.address16.resource_type) {
                temp8 = (u8)
-                       (linked_list->data.address16.attribute.memory.read_write_attribute &
-                        0x01);
+                   (linked_list->data.address16.attribute.memory.
+                    read_write_attribute & 0x01);
 
                temp8 |=
-                       (linked_list->data.address16.attribute.memory.cache_attribute &
-                        0x03) << 1;
-       }
-       else if (ACPI_IO_RANGE == linked_list->data.address16.resource_type) {
+                   (linked_list->data.address16.attribute.memory.
+                    cache_attribute & 0x03) << 1;
+       } else if (ACPI_IO_RANGE == linked_list->data.address16.resource_type) {
                temp8 = (u8)
-                       (linked_list->data.address16.attribute.io.range_attribute &
-                        0x03);
+                   (linked_list->data.address16.attribute.io.range_attribute &
+                    0x03);
                temp8 |=
-                       (linked_list->data.address16.attribute.io.translation_attribute &
-                        0x03) << 4;
+                   (linked_list->data.address16.attribute.io.
+                    translation_attribute & 0x03) << 4;
        }
 
        *buffer = temp8;
        buffer += 1;
 
-       /*
-        * Set the address space granularity
-        */
-       ACPI_MOVE_32_TO_16 (buffer, &linked_list->data.address16.granularity);
+       /* Set the address space granularity */
+
+       ACPI_MOVE_32_TO_16(buffer, &linked_list->data.address16.granularity);
        buffer += 2;
 
-       /*
-        * Set the address range minimum
-        */
-       ACPI_MOVE_32_TO_16 (buffer, &linked_list->data.address16.min_address_range);
+       /* Set the address range minimum */
+
+       ACPI_MOVE_32_TO_16(buffer,
+                          &linked_list->data.address16.min_address_range);
        buffer += 2;
 
-       /*
-        * Set the address range maximum
-        */
-       ACPI_MOVE_32_TO_16 (buffer, &linked_list->data.address16.max_address_range);
+       /* Set the address range maximum */
+
+       ACPI_MOVE_32_TO_16(buffer,
+                          &linked_list->data.address16.max_address_range);
        buffer += 2;
 
-       /*
-        * Set the address translation offset
-        */
-       ACPI_MOVE_32_TO_16 (buffer, &linked_list->data.address16.address_translation_offset);
+       /* Set the address translation offset */
+
+       ACPI_MOVE_32_TO_16(buffer,
+                          &linked_list->data.address16.
+                          address_translation_offset);
        buffer += 2;
 
-       /*
-        * Set the address length
-        */
-       ACPI_MOVE_32_TO_16 (buffer, &linked_list->data.address16.address_length);
+       /* Set the address length */
+
+       ACPI_MOVE_32_TO_16(buffer, &linked_list->data.address16.address_length);
        buffer += 2;
 
-       /*
-        * Resource Source Index and Resource Source are optional
-        */
+       /* Resource Source Index and Resource Source are optional */
+
        if (0 != linked_list->data.address16.resource_source.string_length) {
                temp8 = (u8) linked_list->data.address16.resource_source.index;
 
                *buffer = temp8;
                buffer += 1;
 
-               temp_pointer = (char *) buffer;
+               temp_pointer = (char *)buffer;
 
-               /*
-                * Copy the string
-                */
-               ACPI_STRCPY (temp_pointer,
-                               linked_list->data.address16.resource_source.string_ptr);
+               /* Copy the string */
+
+               ACPI_STRCPY(temp_pointer,
+                           linked_list->data.address16.resource_source.
+                           string_ptr);
 
                /*
                 * Buffer needs to be set to the length of the sting + one for the
                 * terminating null
                 */
-               buffer += (acpi_size)(ACPI_STRLEN (linked_list->data.address16.resource_source.string_ptr) + 1);
+               buffer +=
+                   (acpi_size) (ACPI_STRLEN
+                                (linked_list->data.address16.resource_source.
+                                 string_ptr) + 1);
        }
 
-       /*
-        * Return the number of bytes consumed in this operation
-        */
-       actual_bytes = ACPI_PTR_DIFF (buffer, *output_buffer);
+       /* Return the number of bytes consumed in this operation */
+
+       actual_bytes = ACPI_PTR_DIFF(buffer, *output_buffer);
        *bytes_consumed = actual_bytes;
 
        /*
@@ -427,11 +402,10 @@ acpi_rs_address16_stream (
         * minus the header size (3 bytes)
         */
        actual_bytes -= 3;
-       ACPI_MOVE_SIZE_TO_16 (length_field, &actual_bytes);
-       return_ACPI_STATUS (AE_OK);
+       ACPI_MOVE_SIZE_TO_16(length_field, &actual_bytes);
+       return_ACPI_STATUS(AE_OK);
 }
 
-
 /*******************************************************************************
  *
  * FUNCTION:    acpi_rs_address32_resource
@@ -454,141 +428,126 @@ acpi_rs_address16_stream (
  ******************************************************************************/
 
 acpi_status
-acpi_rs_address32_resource (
-       u8                              *byte_stream_buffer,
-       acpi_size                       *bytes_consumed,
-       u8                              **output_buffer,
-       acpi_size                       *structure_size)
+acpi_rs_address32_resource(u8 * byte_stream_buffer,
+                          acpi_size * bytes_consumed,
+                          u8 ** output_buffer, acpi_size * structure_size)
 {
-       u8                              *buffer;
-       struct acpi_resource            *output_struct= (void *) *output_buffer;
-       u16                             temp16;
-       u8                              temp8;
-       u8                              *temp_ptr;
-       acpi_size                       struct_size;
-       u32                             index;
-
-
-       ACPI_FUNCTION_TRACE ("rs_address32_resource");
+       u8 *buffer;
+       struct acpi_resource *output_struct = (void *)*output_buffer;
+       u16 temp16;
+       u8 temp8;
+       u8 *temp_ptr;
+       acpi_size struct_size;
+       u32 index;
 
+       ACPI_FUNCTION_TRACE("rs_address32_resource");
 
        buffer = byte_stream_buffer;
-       struct_size = ACPI_SIZEOF_RESOURCE (struct acpi_resource_address32);
+       struct_size = ACPI_SIZEOF_RESOURCE(struct acpi_resource_address32);
+
+       /* Point past the Descriptor to get the number of bytes consumed */
 
-       /*
-        * Point past the Descriptor to get the number of bytes consumed
-        */
        buffer += 1;
-       ACPI_MOVE_16_TO_16 (&temp16, buffer);
+       ACPI_MOVE_16_TO_16(&temp16, buffer);
 
        /* Validate minimum descriptor length */
 
        if (temp16 < 23) {
-               return_ACPI_STATUS (AE_AML_BAD_RESOURCE_LENGTH);
+               return_ACPI_STATUS(AE_AML_BAD_RESOURCE_LENGTH);
        }
 
        *bytes_consumed = temp16 + 3;
        output_struct->id = ACPI_RSTYPE_ADDRESS32;
 
-       /*
-        * Get the Resource Type (Byte3)
-        */
+       /* Get the Resource Type (Byte3) */
+
        buffer += 2;
        temp8 = *buffer;
 
        /* Values 0-2 and 0xC0-0xFF are valid */
 
        if ((temp8 > 2) && (temp8 < 0xC0)) {
-               return_ACPI_STATUS (AE_AML_INVALID_RESOURCE_TYPE);
+               return_ACPI_STATUS(AE_AML_INVALID_RESOURCE_TYPE);
        }
 
        output_struct->data.address32.resource_type = temp8;
 
-       /*
-        * Get the General Flags (Byte4)
-        */
+       /* Get the General Flags (Byte4) */
+
        buffer += 1;
        temp8 = *buffer;
 
-       /*
-        * Producer / Consumer
-        */
+       /* Producer / Consumer */
+
        output_struct->data.address32.producer_consumer = temp8 & 0x01;
 
-       /*
-        * Decode
-        */
+       /* Decode */
+
        output_struct->data.address32.decode = (temp8 >> 1) & 0x01;
 
-       /*
-        * Min Address Fixed
-        */
+       /* Min Address Fixed */
+
        output_struct->data.address32.min_address_fixed = (temp8 >> 2) & 0x01;
 
-       /*
-        * Max Address Fixed
-        */
+       /* Max Address Fixed */
+
        output_struct->data.address32.max_address_fixed = (temp8 >> 3) & 0x01;
 
-       /*
-        * Get the Type Specific Flags (Byte5)
-        */
+       /* Get the Type Specific Flags (Byte5) */
+
        buffer += 1;
        temp8 = *buffer;
 
        if (ACPI_MEMORY_RANGE == output_struct->data.address32.resource_type) {
-               output_struct->data.address32.attribute.memory.read_write_attribute =
-                               (u16) (temp8 & 0x01);
+               output_struct->data.address32.attribute.memory.
+                   read_write_attribute = (u16) (temp8 & 0x01);
 
                output_struct->data.address32.attribute.memory.cache_attribute =
-                               (u16) ((temp8 >> 1) & 0x03);
-       }
-       else {
-               if (ACPI_IO_RANGE == output_struct->data.address32.resource_type) {
-                       output_struct->data.address32.attribute.io.range_attribute =
-                               (u16) (temp8 & 0x03);
-                       output_struct->data.address32.attribute.io.translation_attribute =
-                               (u16) ((temp8 >> 4) & 0x03);
-               }
-               else {
+                   (u16) ((temp8 >> 1) & 0x03);
+       } else {
+               if (ACPI_IO_RANGE ==
+                   output_struct->data.address32.resource_type) {
+                       output_struct->data.address32.attribute.io.
+                           range_attribute = (u16) (temp8 & 0x03);
+                       output_struct->data.address32.attribute.io.
+                           translation_attribute = (u16) ((temp8 >> 4) & 0x03);
+               } else {
                        /* BUS_NUMBER_RANGE == output_struct->Data.Address32.resource_type */
                        /* Nothing needs to be filled in */
                }
        }
 
-       /*
-        * Get Granularity (Bytes 6-9)
-        */
+       /* Get Granularity (Bytes 6-9) */
+
        buffer += 1;
-       ACPI_MOVE_32_TO_32 (&output_struct->data.address32.granularity, buffer);
+       ACPI_MOVE_32_TO_32(&output_struct->data.address32.granularity, buffer);
+
+       /* Get min_address_range (Bytes 10-13) */
 
-       /*
-        * Get min_address_range (Bytes 10-13)
-        */
        buffer += 4;
-       ACPI_MOVE_32_TO_32 (&output_struct->data.address32.min_address_range, buffer);
+       ACPI_MOVE_32_TO_32(&output_struct->data.address32.min_address_range,
+                          buffer);
+
+       /* Get max_address_range (Bytes 14-17) */
 
-       /*
-        * Get max_address_range (Bytes 14-17)
-        */
        buffer += 4;
-       ACPI_MOVE_32_TO_32 (&output_struct->data.address32.max_address_range, buffer);
+       ACPI_MOVE_32_TO_32(&output_struct->data.address32.max_address_range,
+                          buffer);
+
+       /* Get address_translation_offset (Bytes 18-21) */
 
-       /*
-        * Get address_translation_offset (Bytes 18-21)
-        */
        buffer += 4;
-       ACPI_MOVE_32_TO_32 (&output_struct->data.address32.address_translation_offset, buffer);
+       ACPI_MOVE_32_TO_32(&output_struct->data.address32.
+                          address_translation_offset, buffer);
+
+       /* Get address_length (Bytes 22-25) */
 
-       /*
-        * Get address_length (Bytes 22-25)
-        */
        buffer += 4;
-       ACPI_MOVE_32_TO_32 (&output_struct->data.address32.address_length, buffer);
+       ACPI_MOVE_32_TO_32(&output_struct->data.address32.address_length,
+                          buffer);
+
+       /* Resource Source Index (if present) */
 
-       /*
-        * Resource Source Index (if present)
-        */
        buffer += 4;
 
        /*
@@ -604,7 +563,7 @@ acpi_rs_address32_resource (
 
                temp8 = *buffer;
                output_struct->data.address32.resource_source.index =
-                               (u32) temp8;
+                   (u32) temp8;
 
                /* Point to the String */
 
@@ -613,9 +572,10 @@ acpi_rs_address32_resource (
                /* Point the String pointer to the end of this structure */
 
                output_struct->data.address32.resource_source.string_ptr =
-                               (char *)((u8 *)output_struct + struct_size);
+                   (char *)((u8 *) output_struct + struct_size);
 
-               temp_ptr = (u8 *) output_struct->data.address32.resource_source.string_ptr;
+               temp_ptr = (u8 *)
+                   output_struct->data.address32.resource_source.string_ptr;
 
                /* Copy the string into the buffer */
 
@@ -628,11 +588,11 @@ acpi_rs_address32_resource (
                        index += 1;
                }
 
-               /*
-                * Add the terminating null
-                */
+               /* Add the terminating null */
+
                *temp_ptr = 0x00;
-               output_struct->data.address32.resource_source.string_length = index + 1;
+               output_struct->data.address32.resource_source.string_length =
+                   index + 1;
 
                /*
                 * In order for the struct_size to fall on a 32-bit boundary,
@@ -640,27 +600,23 @@ acpi_rs_address32_resource (
                 * struct_size to the next 32-bit boundary.
                 */
                temp8 = (u8) (index + 1);
-               struct_size += ACPI_ROUND_UP_to_32_bITS (temp8);
-       }
-       else {
+               struct_size += ACPI_ROUND_UP_to_32_bITS(temp8);
+       } else {
                output_struct->data.address32.resource_source.index = 0x00;
                output_struct->data.address32.resource_source.string_length = 0;
                output_struct->data.address32.resource_source.string_ptr = NULL;
        }
 
-       /*
-        * Set the Length parameter
-        */
+       /* Set the Length parameter */
+
        output_struct->length = (u32) struct_size;
 
-       /*
-        * Return the final size of the structure
-        */
+       /* Return the final size of the structure */
+
        *structure_size = struct_size;
-       return_ACPI_STATUS (AE_OK);
+       return_ACPI_STATUS(AE_OK);
 }
 
-
 /*******************************************************************************
  *
  * FUNCTION:    acpi_rs_address32_stream
@@ -678,45 +634,37 @@ acpi_rs_address32_resource (
  ******************************************************************************/
 
 acpi_status
-acpi_rs_address32_stream (
-       struct acpi_resource            *linked_list,
-       u8                              **output_buffer,
-       acpi_size                       *bytes_consumed)
+acpi_rs_address32_stream(struct acpi_resource *linked_list,
+                        u8 ** output_buffer, acpi_size * bytes_consumed)
 {
-       u8                              *buffer;
-       u16                             *length_field;
-       u8                              temp8;
-       char                            *temp_pointer;
-
-
-       ACPI_FUNCTION_TRACE ("rs_address32_stream");
+       u8 *buffer;
+       u16 *length_field;
+       u8 temp8;
+       char *temp_pointer;
 
+       ACPI_FUNCTION_TRACE("rs_address32_stream");
 
        buffer = *output_buffer;
 
-       /*
-        * The descriptor field is static
-        */
+       /* The descriptor field is static */
+
        *buffer = 0x87;
        buffer += 1;
 
-       /*
-        * Set a pointer to the Length field - to be filled in later
-        */
-       length_field = ACPI_CAST_PTR (u16, buffer);
+       /* Set a pointer to the Length field - to be filled in later */
+
+       length_field = ACPI_CAST_PTR(u16, buffer);
        buffer += 2;
 
-       /*
-        * Set the Resource Type (Memory, Io, bus_number)
-        */
+       /* Set the Resource Type (Memory, Io, bus_number) */
+
        temp8 = (u8) (linked_list->data.address32.resource_type & 0x03);
 
        *buffer = temp8;
        buffer += 1;
 
-       /*
-        * Set the general flags
-        */
+       /* Set the general flags */
+
        temp8 = (u8) (linked_list->data.address32.producer_consumer & 0x01);
        temp8 |= (linked_list->data.address32.decode & 0x01) << 1;
        temp8 |= (linked_list->data.address32.min_address_fixed & 0x01) << 2;
@@ -725,100 +673,97 @@ acpi_rs_address32_stream (
        *buffer = temp8;
        buffer += 1;
 
-       /*
-        * Set the type specific flags
-        */
+       /* Set the type specific flags */
+
        temp8 = 0;
 
        if (ACPI_MEMORY_RANGE == linked_list->data.address32.resource_type) {
                temp8 = (u8)
-                       (linked_list->data.address32.attribute.memory.read_write_attribute &
-                       0x01);
+                   (linked_list->data.address32.attribute.memory.
+                    read_write_attribute & 0x01);
 
                temp8 |=
-                       (linked_list->data.address32.attribute.memory.cache_attribute &
-                        0x03) << 1;
-       }
-       else if (ACPI_IO_RANGE == linked_list->data.address32.resource_type) {
+                   (linked_list->data.address32.attribute.memory.
+                    cache_attribute & 0x03) << 1;
+       } else if (ACPI_IO_RANGE == linked_list->data.address32.resource_type) {
                temp8 = (u8)
-                       (linked_list->data.address32.attribute.io.range_attribute &
-                        0x03);
+                   (linked_list->data.address32.attribute.io.range_attribute &
+                    0x03);
                temp8 |=
-                       (linked_list->data.address32.attribute.io.translation_attribute &
-                        0x03) << 4;
+                   (linked_list->data.address32.attribute.io.
+                    translation_attribute & 0x03) << 4;
        }
 
        *buffer = temp8;
        buffer += 1;
 
-       /*
-        * Set the address space granularity
-        */
-       ACPI_MOVE_32_TO_32 (buffer, &linked_list->data.address32.granularity);
+       /* Set the address space granularity */
+
+       ACPI_MOVE_32_TO_32(buffer, &linked_list->data.address32.granularity);
        buffer += 4;
 
-       /*
-        * Set the address range minimum
-        */
-       ACPI_MOVE_32_TO_32 (buffer, &linked_list->data.address32.min_address_range);
+       /* Set the address range minimum */
+
+       ACPI_MOVE_32_TO_32(buffer,
+                          &linked_list->data.address32.min_address_range);
        buffer += 4;
 
-       /*
-        * Set the address range maximum
-        */
-       ACPI_MOVE_32_TO_32 (buffer, &linked_list->data.address32.max_address_range);
+       /* Set the address range maximum */
+
+       ACPI_MOVE_32_TO_32(buffer,
+                          &linked_list->data.address32.max_address_range);
        buffer += 4;
 
-       /*
-        * Set the address translation offset
-        */
-       ACPI_MOVE_32_TO_32 (buffer, &linked_list->data.address32.address_translation_offset);
+       /* Set the address translation offset */
+
+       ACPI_MOVE_32_TO_32(buffer,
+                          &linked_list->data.address32.
+                          address_translation_offset);
        buffer += 4;
 
-       /*
-        * Set the address length
-        */
-       ACPI_MOVE_32_TO_32 (buffer, &linked_list->data.address32.address_length);
+       /* Set the address length */
+
+       ACPI_MOVE_32_TO_32(buffer, &linked_list->data.address32.address_length);
        buffer += 4;
 
-       /*
-        * Resource Source Index and Resource Source are optional
-        */
+       /* Resource Source Index and Resource Source are optional */
+
        if (0 != linked_list->data.address32.resource_source.string_length) {
                temp8 = (u8) linked_list->data.address32.resource_source.index;
 
                *buffer = temp8;
                buffer += 1;
 
-               temp_pointer = (char *) buffer;
+               temp_pointer = (char *)buffer;
 
-               /*
-                * Copy the string
-                */
-               ACPI_STRCPY (temp_pointer,
-                       linked_list->data.address32.resource_source.string_ptr);
+               /* Copy the string */
+
+               ACPI_STRCPY(temp_pointer,
+                           linked_list->data.address32.resource_source.
+                           string_ptr);
 
                /*
                 * Buffer needs to be set to the length of the sting + one for the
                 *  terminating null
                 */
-               buffer += (acpi_size)(ACPI_STRLEN (linked_list->data.address32.resource_source.string_ptr) + 1);
+               buffer +=
+                   (acpi_size) (ACPI_STRLEN
+                                (linked_list->data.address32.resource_source.
+                                 string_ptr) + 1);
        }
 
-       /*
-        * Return the number of bytes consumed in this operation
-        */
-       *bytes_consumed = ACPI_PTR_DIFF (buffer, *output_buffer);
+       /* Return the number of bytes consumed in this operation */
+
+       *bytes_consumed = ACPI_PTR_DIFF(buffer, *output_buffer);
 
        /*
         * Set the length field to the number of bytes consumed
         *  minus the header size (3 bytes)
         */
        *length_field = (u16) (*bytes_consumed - 3);
-       return_ACPI_STATUS (AE_OK);
+       return_ACPI_STATUS(AE_OK);
 }
 
-
 /*******************************************************************************
  *
  * FUNCTION:    acpi_rs_address64_resource
@@ -841,105 +786,92 @@ acpi_rs_address32_stream (
  ******************************************************************************/
 
 acpi_status
-acpi_rs_address64_resource (
-       u8                              *byte_stream_buffer,
-       acpi_size                       *bytes_consumed,
-       u8                              **output_buffer,
-       acpi_size                       *structure_size)
+acpi_rs_address64_resource(u8 * byte_stream_buffer,
+                          acpi_size * bytes_consumed,
+                          u8 ** output_buffer, acpi_size * structure_size)
 {
-       u8                              *buffer;
-       struct acpi_resource            *output_struct = (void *) *output_buffer;
-       u16                             temp16;
-       u8                              temp8;
-       u8                              resource_type;
-       u8                              *temp_ptr;
-       acpi_size                       struct_size;
-       u32                             index;
-
-
-       ACPI_FUNCTION_TRACE ("rs_address64_resource");
+       u8 *buffer;
+       struct acpi_resource *output_struct = (void *)*output_buffer;
+       u16 temp16;
+       u8 temp8;
+       u8 resource_type;
+       u8 *temp_ptr;
+       acpi_size struct_size;
+       u32 index;
 
+       ACPI_FUNCTION_TRACE("rs_address64_resource");
 
        buffer = byte_stream_buffer;
-       struct_size = ACPI_SIZEOF_RESOURCE (struct acpi_resource_address64);
+       struct_size = ACPI_SIZEOF_RESOURCE(struct acpi_resource_address64);
        resource_type = *buffer;
 
-       /*
-        * Point past the Descriptor to get the number of bytes consumed
-        */
+       /* Point past the Descriptor to get the number of bytes consumed */
+
        buffer += 1;
-       ACPI_MOVE_16_TO_16 (&temp16, buffer);
+       ACPI_MOVE_16_TO_16(&temp16, buffer);
 
        /* Validate minimum descriptor length */
 
        if (temp16 < 43) {
-               return_ACPI_STATUS (AE_AML_BAD_RESOURCE_LENGTH);
+               return_ACPI_STATUS(AE_AML_BAD_RESOURCE_LENGTH);
        }
 
        *bytes_consumed = temp16 + 3;
        output_struct->id = ACPI_RSTYPE_ADDRESS64;
 
-       /*
-        * Get the Resource Type (Byte3)
-        */
+       /* Get the Resource Type (Byte3) */
+
        buffer += 2;
        temp8 = *buffer;
 
        /* Values 0-2 and 0xC0-0xFF are valid */
 
        if ((temp8 > 2) && (temp8 < 0xC0)) {
-               return_ACPI_STATUS (AE_AML_INVALID_RESOURCE_TYPE);
+               return_ACPI_STATUS(AE_AML_INVALID_RESOURCE_TYPE);
        }
 
        output_struct->data.address64.resource_type = temp8;
 
-       /*
-        * Get the General Flags (Byte4)
-        */
+       /* Get the General Flags (Byte4) */
+
        buffer += 1;
        temp8 = *buffer;
 
-       /*
-        * Producer / Consumer
-        */
+       /* Producer / Consumer */
+
        output_struct->data.address64.producer_consumer = temp8 & 0x01;
 
-       /*
-        * Decode
-        */
+       /* Decode */
+
        output_struct->data.address64.decode = (temp8 >> 1) & 0x01;
 
-       /*
-        * Min Address Fixed
-        */
+       /* Min Address Fixed */
+
        output_struct->data.address64.min_address_fixed = (temp8 >> 2) & 0x01;
 
-       /*
-        * Max Address Fixed
-        */
+       /* Max Address Fixed */
+
        output_struct->data.address64.max_address_fixed = (temp8 >> 3) & 0x01;
 
-       /*
-        * Get the Type Specific Flags (Byte5)
-        */
+       /* Get the Type Specific Flags (Byte5) */
+
        buffer += 1;
        temp8 = *buffer;
 
        if (ACPI_MEMORY_RANGE == output_struct->data.address64.resource_type) {
-               output_struct->data.address64.attribute.memory.read_write_attribute =
-                               (u16) (temp8 & 0x01);
+               output_struct->data.address64.attribute.memory.
+                   read_write_attribute = (u16) (temp8 & 0x01);
 
                output_struct->data.address64.attribute.memory.cache_attribute =
-                               (u16) ((temp8 >> 1) & 0x03);
-       }
-       else {
-               if (ACPI_IO_RANGE == output_struct->data.address64.resource_type) {
-                       output_struct->data.address64.attribute.io.range_attribute =
-                               (u16) (temp8 & 0x03);
-                       output_struct->data.address64.attribute.io.translation_attribute =
-                               (u16) ((temp8 >> 4) & 0x03);
-               }
-               else {
+                   (u16) ((temp8 >> 1) & 0x03);
+       } else {
+               if (ACPI_IO_RANGE ==
+                   output_struct->data.address64.resource_type) {
+                       output_struct->data.address64.attribute.io.
+                           range_attribute = (u16) (temp8 & 0x03);
+                       output_struct->data.address64.attribute.io.
+                           translation_attribute = (u16) ((temp8 >> 4) & 0x03);
+               } else {
                        /* BUS_NUMBER_RANGE == output_struct->Data.Address64.resource_type */
                        /* Nothing needs to be filled in */
                }
@@ -951,35 +883,34 @@ acpi_rs_address64_resource (
                buffer += 2;
        }
 
-       /*
-        * Get Granularity (Bytes 6-13) or (Bytes 8-15)
-        */
+       /* Get Granularity (Bytes 6-13) or (Bytes 8-15) */
+
        buffer += 1;
-       ACPI_MOVE_64_TO_64 (&output_struct->data.address64.granularity, buffer);
+       ACPI_MOVE_64_TO_64(&output_struct->data.address64.granularity, buffer);
+
+       /* Get min_address_range (Bytes 14-21) or (Bytes 16-23) */
 
-       /*
-        * Get min_address_range (Bytes 14-21) or (Bytes 16-23)
-        */
        buffer += 8;
-       ACPI_MOVE_64_TO_64 (&output_struct->data.address64.min_address_range, buffer);
+       ACPI_MOVE_64_TO_64(&output_struct->data.address64.min_address_range,
+                          buffer);
+
+       /* Get max_address_range (Bytes 22-29) or (Bytes 24-31) */
 
-       /*
-        * Get max_address_range (Bytes 22-29) or (Bytes 24-31)
-        */
        buffer += 8;
-       ACPI_MOVE_64_TO_64 (&output_struct->data.address64.max_address_range, buffer);
+       ACPI_MOVE_64_TO_64(&output_struct->data.address64.max_address_range,
+                          buffer);
+
+       /* Get address_translation_offset (Bytes 30-37) or (Bytes 32-39) */
 
-       /*
-        * Get address_translation_offset (Bytes 30-37) or (Bytes 32-39)
-        */
        buffer += 8;
-       ACPI_MOVE_64_TO_64 (&output_struct->data.address64.address_translation_offset, buffer);
+       ACPI_MOVE_64_TO_64(&output_struct->data.address64.
+                          address_translation_offset, buffer);
+
+       /* Get address_length (Bytes 38-45) or (Bytes 40-47) */
 
-       /*
-        * Get address_length (Bytes 38-45) or (Bytes 40-47)
-        */
        buffer += 8;
-       ACPI_MOVE_64_TO_64 (&output_struct->data.address64.address_length, buffer);
+       ACPI_MOVE_64_TO_64(&output_struct->data.address64.address_length,
+                          buffer);
 
        output_struct->data.address64.resource_source.index = 0x00;
        output_struct->data.address64.resource_source.string_length = 0;
@@ -989,14 +920,13 @@ acpi_rs_address64_resource (
                /* Get type_specific_attribute (Bytes 48-55) */
 
                buffer += 8;
-               ACPI_MOVE_64_TO_64 (&output_struct->data.address64.type_specific_attributes, buffer);
-       }
-       else {
+               ACPI_MOVE_64_TO_64(&output_struct->data.address64.
+                                  type_specific_attributes, buffer);
+       else {
                output_struct->data.address64.type_specific_attributes = 0;
 
-               /*
-                * Resource Source Index (if present)
-                */
+               /* Resource Source Index (if present) */
+
                buffer += 8;
 
                /*
@@ -1014,7 +944,7 @@ acpi_rs_address64_resource (
 
                        temp8 = *buffer;
                        output_struct->data.address64.resource_source.index =
-                                       (u32) temp8;
+                           (u32) temp8;
 
                        /* Point to the String */
 
@@ -1022,10 +952,13 @@ acpi_rs_address64_resource (
 
                        /* Point the String pointer to the end of this structure */
 
-                       output_struct->data.address64.resource_source.string_ptr =
-                                       (char *)((u8 *)output_struct + struct_size);
+                       output_struct->data.address64.resource_source.
+                           string_ptr =
+                           (char *)((u8 *) output_struct + struct_size);
 
-                       temp_ptr = (u8 *) output_struct->data.address64.resource_source.string_ptr;
+                       temp_ptr = (u8 *)
+                           output_struct->data.address64.resource_source.
+                           string_ptr;
 
                        /* Copy the string into the buffer */
 
@@ -1042,7 +975,8 @@ acpi_rs_address64_resource (
                         * Add the terminating null
                         */
                        *temp_ptr = 0x00;
-                       output_struct->data.address64.resource_source.string_length = index + 1;
+                       output_struct->data.address64.resource_source.
+                           string_length = index + 1;
 
                        /*
                         * In order for the struct_size to fall on a 32-bit boundary,
@@ -1050,23 +984,20 @@ acpi_rs_address64_resource (
                         * struct_size to the next 32-bit boundary.
                         */
                        temp8 = (u8) (index + 1);
-                       struct_size += ACPI_ROUND_UP_to_32_bITS (temp8);
+                       struct_size += ACPI_ROUND_UP_to_32_bITS(temp8);
                }
        }
 
-       /*
-        * Set the Length parameter
-        */
+       /* Set the Length parameter */
+
        output_struct->length = (u32) struct_size;
 
-       /*
-        * Return the final size of the structure
-        */
+       /* Return the final size of the structure */
+
        *structure_size = struct_size;
-       return_ACPI_STATUS (AE_OK);
+       return_ACPI_STATUS(AE_OK);
 }
 
-
 /*******************************************************************************
  *
  * FUNCTION:    acpi_rs_address64_stream
@@ -1084,45 +1015,37 @@ acpi_rs_address64_resource (
  ******************************************************************************/
 
 acpi_status
-acpi_rs_address64_stream (
-       struct acpi_resource            *linked_list,
-       u8                              **output_buffer,
-       acpi_size                       *bytes_consumed)
+acpi_rs_address64_stream(struct acpi_resource *linked_list,
+                        u8 ** output_buffer, acpi_size * bytes_consumed)
 {
-       u8                              *buffer;
-       u16                             *length_field;
-       u8                              temp8;
-       char                            *temp_pointer;
-
-
-       ACPI_FUNCTION_TRACE ("rs_address64_stream");
+       u8 *buffer;
+       u16 *length_field;
+       u8 temp8;
+       char *temp_pointer;
 
+       ACPI_FUNCTION_TRACE("rs_address64_stream");
 
        buffer = *output_buffer;
 
-       /*
-        * The descriptor field is static
-        */
+       /* The descriptor field is static */
+
        *buffer = 0x8A;
        buffer += 1;
 
-       /*
-        * Set a pointer to the Length field - to be filled in later
-        */
-       length_field = ACPI_CAST_PTR (u16, buffer);
+       /* Set a pointer to the Length field - to be filled in later */
+
+       length_field = ACPI_CAST_PTR(u16, buffer);
        buffer += 2;
 
-       /*
-        * Set the Resource Type (Memory, Io, bus_number)
-        */
+       /* Set the Resource Type (Memory, Io, bus_number) */
+
        temp8 = (u8) (linked_list->data.address64.resource_type & 0x03);
 
        *buffer = temp8;
        buffer += 1;
 
-       /*
-        * Set the general flags
-        */
+       /* Set the general flags */
+
        temp8 = (u8) (linked_list->data.address64.producer_consumer & 0x01);
        temp8 |= (linked_list->data.address64.decode & 0x01) << 1;
        temp8 |= (linked_list->data.address64.min_address_fixed & 0x01) << 2;
@@ -1131,95 +1054,93 @@ acpi_rs_address64_stream (
        *buffer = temp8;
        buffer += 1;
 
-       /*
-        * Set the type specific flags
-        */
+       /* Set the type specific flags */
+
        temp8 = 0;
 
        if (ACPI_MEMORY_RANGE == linked_list->data.address64.resource_type) {
                temp8 = (u8)
-                       (linked_list->data.address64.attribute.memory.read_write_attribute &
-                       0x01);
+                   (linked_list->data.address64.attribute.memory.
+                    read_write_attribute & 0x01);
 
                temp8 |=
-                       (linked_list->data.address64.attribute.memory.cache_attribute &
-                        0x03) << 1;
-       }
-       else if (ACPI_IO_RANGE == linked_list->data.address64.resource_type) {
+                   (linked_list->data.address64.attribute.memory.
+                    cache_attribute & 0x03) << 1;
+       } else if (ACPI_IO_RANGE == linked_list->data.address64.resource_type) {
                temp8 = (u8)
-                       (linked_list->data.address64.attribute.io.range_attribute &
-                        0x03);
+                   (linked_list->data.address64.attribute.io.range_attribute &
+                    0x03);
                temp8 |=
-                       (linked_list->data.address64.attribute.io.range_attribute &
-                        0x03) << 4;
+                   (linked_list->data.address64.attribute.io.range_attribute &
+                    0x03) << 4;
        }
 
        *buffer = temp8;
        buffer += 1;
 
-       /*
-        * Set the address space granularity
-        */
-       ACPI_MOVE_64_TO_64 (buffer, &linked_list->data.address64.granularity);
+       /* Set the address space granularity */
+
+       ACPI_MOVE_64_TO_64(buffer, &linked_list->data.address64.granularity);
        buffer += 8;
 
-       /*
-        * Set the address range minimum
-        */
-       ACPI_MOVE_64_TO_64 (buffer, &linked_list->data.address64.min_address_range);
+       /* Set the address range minimum */
+
+       ACPI_MOVE_64_TO_64(buffer,
+                          &linked_list->data.address64.min_address_range);
        buffer += 8;
 
-       /*
-        * Set the address range maximum
-        */
-       ACPI_MOVE_64_TO_64 (buffer, &linked_list->data.address64.max_address_range);
+       /* Set the address range maximum */
+
+       ACPI_MOVE_64_TO_64(buffer,
+                          &linked_list->data.address64.max_address_range);
        buffer += 8;
 
-       /*
-        * Set the address translation offset
-        */
-       ACPI_MOVE_64_TO_64 (buffer, &linked_list->data.address64.address_translation_offset);
+       /* Set the address translation offset */
+
+       ACPI_MOVE_64_TO_64(buffer,
+                          &linked_list->data.address64.
+                          address_translation_offset);
        buffer += 8;
 
-       /*
-        * Set the address length
-        */
-       ACPI_MOVE_64_TO_64 (buffer, &linked_list->data.address64.address_length);
+       /* Set the address length */
+
+       ACPI_MOVE_64_TO_64(buffer, &linked_list->data.address64.address_length);
        buffer += 8;
 
-       /*
-        * Resource Source Index and Resource Source are optional
-        */
+       /* Resource Source Index and Resource Source are optional */
+
        if (0 != linked_list->data.address64.resource_source.string_length) {
                temp8 = (u8) linked_list->data.address64.resource_source.index;
 
                *buffer = temp8;
                buffer += 1;
 
-               temp_pointer = (char *) buffer;
+               temp_pointer = (char *)buffer;
 
-               /*
-                * Copy the string
-                */
-               ACPI_STRCPY (temp_pointer, linked_list->data.address64.resource_source.string_ptr);
+               /* Copy the string */
+
+               ACPI_STRCPY(temp_pointer,
+                           linked_list->data.address64.resource_source.
+                           string_ptr);
 
                /*
                 * Buffer needs to be set to the length of the sting + one for the
                 * terminating null
                 */
-               buffer += (acpi_size)(ACPI_STRLEN (linked_list->data.address64.resource_source.string_ptr) + 1);
+               buffer +=
+                   (acpi_size) (ACPI_STRLEN
+                                (linked_list->data.address64.resource_source.
+                                 string_ptr) + 1);
        }
 
-       /*
-        * Return the number of bytes consumed in this operation
-        */
-       *bytes_consumed = ACPI_PTR_DIFF (buffer, *output_buffer);
+       /* Return the number of bytes consumed in this operation */
+
+       *bytes_consumed = ACPI_PTR_DIFF(buffer, *output_buffer);
 
        /*
         * Set the length field to the number of bytes consumed
         * minus the header size (3 bytes)
         */
        *length_field = (u16) (*bytes_consumed - 3);
-       return_ACPI_STATUS (AE_OK);
+       return_ACPI_STATUS(AE_OK);
 }
-