diff options
Diffstat (limited to 'drivers/acpi/acpica/exfldio.c')
-rw-r--r-- | drivers/acpi/acpica/exfldio.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/drivers/acpi/acpica/exfldio.c b/drivers/acpi/acpica/exfldio.c index a7784152ed30..aa2ccfb7cb61 100644 --- a/drivers/acpi/acpica/exfldio.c +++ b/drivers/acpi/acpica/exfldio.c | |||
@@ -54,8 +54,7 @@ ACPI_MODULE_NAME("exfldio") | |||
54 | /* Local prototypes */ | 54 | /* Local prototypes */ |
55 | static acpi_status | 55 | static acpi_status |
56 | acpi_ex_field_datum_io(union acpi_operand_object *obj_desc, | 56 | acpi_ex_field_datum_io(union acpi_operand_object *obj_desc, |
57 | u32 field_datum_byte_offset, | 57 | u32 field_datum_byte_offset, u64 *value, u32 read_write); |
58 | u64 *value, u32 read_write); | ||
59 | 58 | ||
60 | static u8 | 59 | static u8 |
61 | acpi_ex_register_overflow(union acpi_operand_object *obj_desc, u64 value); | 60 | acpi_ex_register_overflow(union acpi_operand_object *obj_desc, u64 value); |
@@ -155,7 +154,7 @@ acpi_ex_setup_region(union acpi_operand_object *obj_desc, | |||
155 | #endif | 154 | #endif |
156 | 155 | ||
157 | /* | 156 | /* |
158 | * Validate the request. The entire request from the byte offset for a | 157 | * Validate the request. The entire request from the byte offset for a |
159 | * length of one field datum (access width) must fit within the region. | 158 | * length of one field datum (access width) must fit within the region. |
160 | * (Region length is specified in bytes) | 159 | * (Region length is specified in bytes) |
161 | */ | 160 | */ |
@@ -183,7 +182,7 @@ acpi_ex_setup_region(union acpi_operand_object *obj_desc, | |||
183 | obj_desc->common_field.access_byte_width) { | 182 | obj_desc->common_field.access_byte_width) { |
184 | /* | 183 | /* |
185 | * This is the case where the access_type (acc_word, etc.) is wider | 184 | * This is the case where the access_type (acc_word, etc.) is wider |
186 | * than the region itself. For example, a region of length one | 185 | * than the region itself. For example, a region of length one |
187 | * byte, and a field with Dword access specified. | 186 | * byte, and a field with Dword access specified. |
188 | */ | 187 | */ |
189 | ACPI_ERROR((AE_INFO, | 188 | ACPI_ERROR((AE_INFO, |
@@ -321,7 +320,7 @@ acpi_ex_access_region(union acpi_operand_object *obj_desc, | |||
321 | * | 320 | * |
322 | * DESCRIPTION: Check if a value is out of range of the field being written. | 321 | * DESCRIPTION: Check if a value is out of range of the field being written. |
323 | * Used to check if the values written to Index and Bank registers | 322 | * Used to check if the values written to Index and Bank registers |
324 | * are out of range. Normally, the value is simply truncated | 323 | * are out of range. Normally, the value is simply truncated |
325 | * to fit the field, but this case is most likely a serious | 324 | * to fit the field, but this case is most likely a serious |
326 | * coding error in the ASL. | 325 | * coding error in the ASL. |
327 | * | 326 | * |
@@ -370,7 +369,7 @@ acpi_ex_register_overflow(union acpi_operand_object *obj_desc, u64 value) | |||
370 | * | 369 | * |
371 | * RETURN: Status | 370 | * RETURN: Status |
372 | * | 371 | * |
373 | * DESCRIPTION: Read or Write a single datum of a field. The field_type is | 372 | * DESCRIPTION: Read or Write a single datum of a field. The field_type is |
374 | * demultiplexed here to handle the different types of fields | 373 | * demultiplexed here to handle the different types of fields |
375 | * (buffer_field, region_field, index_field, bank_field) | 374 | * (buffer_field, region_field, index_field, bank_field) |
376 | * | 375 | * |
@@ -860,7 +859,7 @@ acpi_ex_insert_into_field(union acpi_operand_object *obj_desc, | |||
860 | ACPI_ROUND_BITS_UP_TO_BYTES(obj_desc->common_field.bit_length); | 859 | ACPI_ROUND_BITS_UP_TO_BYTES(obj_desc->common_field.bit_length); |
861 | /* | 860 | /* |
862 | * We must have a buffer that is at least as long as the field | 861 | * We must have a buffer that is at least as long as the field |
863 | * we are writing to. This is because individual fields are | 862 | * we are writing to. This is because individual fields are |
864 | * indivisible and partial writes are not supported -- as per | 863 | * indivisible and partial writes are not supported -- as per |
865 | * the ACPI specification. | 864 | * the ACPI specification. |
866 | */ | 865 | */ |
@@ -875,7 +874,7 @@ acpi_ex_insert_into_field(union acpi_operand_object *obj_desc, | |||
875 | 874 | ||
876 | /* | 875 | /* |
877 | * Copy the original data to the new buffer, starting | 876 | * Copy the original data to the new buffer, starting |
878 | * at Byte zero. All unused (upper) bytes of the | 877 | * at Byte zero. All unused (upper) bytes of the |
879 | * buffer will be 0. | 878 | * buffer will be 0. |
880 | */ | 879 | */ |
881 | ACPI_MEMCPY((char *)new_buffer, (char *)buffer, buffer_length); | 880 | ACPI_MEMCPY((char *)new_buffer, (char *)buffer, buffer_length); |