aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/acpi/acpica/exprep.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/acpi/acpica/exprep.c')
-rw-r--r--drivers/acpi/acpica/exprep.c23
1 files changed, 7 insertions, 16 deletions
diff --git a/drivers/acpi/acpica/exprep.c b/drivers/acpi/acpica/exprep.c
index 25059dace0ad..98a331d2249b 100644
--- a/drivers/acpi/acpica/exprep.c
+++ b/drivers/acpi/acpica/exprep.c
@@ -108,11 +108,11 @@ acpi_ex_generate_access(u32 field_bit_offset,
108 field_byte_length = field_byte_end_offset - field_byte_offset; 108 field_byte_length = field_byte_end_offset - field_byte_offset;
109 109
110 ACPI_DEBUG_PRINT((ACPI_DB_BFIELD, 110 ACPI_DEBUG_PRINT((ACPI_DB_BFIELD,
111 "Bit length %d, Bit offset %d\n", 111 "Bit length %u, Bit offset %u\n",
112 field_bit_length, field_bit_offset)); 112 field_bit_length, field_bit_offset));
113 113
114 ACPI_DEBUG_PRINT((ACPI_DB_BFIELD, 114 ACPI_DEBUG_PRINT((ACPI_DB_BFIELD,
115 "Byte Length %d, Byte Offset %d, End Offset %d\n", 115 "Byte Length %u, Byte Offset %u, End Offset %u\n",
116 field_byte_length, field_byte_offset, 116 field_byte_length, field_byte_offset,
117 field_byte_end_offset)); 117 field_byte_end_offset));
118 118
@@ -147,11 +147,11 @@ acpi_ex_generate_access(u32 field_bit_offset,
147 accesses = field_end_offset - field_start_offset; 147 accesses = field_end_offset - field_start_offset;
148 148
149 ACPI_DEBUG_PRINT((ACPI_DB_BFIELD, 149 ACPI_DEBUG_PRINT((ACPI_DB_BFIELD,
150 "AccessWidth %d end is within region\n", 150 "AccessWidth %u end is within region\n",
151 access_byte_width)); 151 access_byte_width));
152 152
153 ACPI_DEBUG_PRINT((ACPI_DB_BFIELD, 153 ACPI_DEBUG_PRINT((ACPI_DB_BFIELD,
154 "Field Start %d, Field End %d -- requires %d accesses\n", 154 "Field Start %u, Field End %u -- requires %u accesses\n",
155 field_start_offset, field_end_offset, 155 field_start_offset, field_end_offset,
156 accesses)); 156 accesses));
157 157
@@ -159,7 +159,7 @@ acpi_ex_generate_access(u32 field_bit_offset,
159 159
160 if (accesses <= 1) { 160 if (accesses <= 1) {
161 ACPI_DEBUG_PRINT((ACPI_DB_BFIELD, 161 ACPI_DEBUG_PRINT((ACPI_DB_BFIELD,
162 "Entire field can be accessed with one operation of size %d\n", 162 "Entire field can be accessed with one operation of size %u\n",
163 access_byte_width)); 163 access_byte_width));
164 return_VALUE(access_byte_width); 164 return_VALUE(access_byte_width);
165 } 165 }
@@ -174,7 +174,7 @@ acpi_ex_generate_access(u32 field_bit_offset,
174 } 174 }
175 } else { 175 } else {
176 ACPI_DEBUG_PRINT((ACPI_DB_BFIELD, 176 ACPI_DEBUG_PRINT((ACPI_DB_BFIELD,
177 "AccessWidth %d end is NOT within region\n", 177 "AccessWidth %u end is NOT within region\n",
178 access_byte_width)); 178 access_byte_width));
179 if (access_byte_width == 1) { 179 if (access_byte_width == 1) {
180 ACPI_DEBUG_PRINT((ACPI_DB_BFIELD, 180 ACPI_DEBUG_PRINT((ACPI_DB_BFIELD,
@@ -190,7 +190,7 @@ acpi_ex_generate_access(u32 field_bit_offset,
190 * previous access 190 * previous access
191 */ 191 */
192 ACPI_DEBUG_PRINT((ACPI_DB_BFIELD, 192 ACPI_DEBUG_PRINT((ACPI_DB_BFIELD,
193 "Backing off to previous optimal access width of %d\n", 193 "Backing off to previous optimal access width of %u\n",
194 minimum_access_width)); 194 minimum_access_width));
195 return_VALUE(minimum_access_width); 195 return_VALUE(minimum_access_width);
196 } 196 }
@@ -385,15 +385,6 @@ acpi_ex_prep_common_field_object(union acpi_operand_object *obj_desc,
385 (field_bit_position - 385 (field_bit_position -
386 ACPI_MUL_8(obj_desc->common_field.base_byte_offset)); 386 ACPI_MUL_8(obj_desc->common_field.base_byte_offset));
387 387
388 /*
389 * Does the entire field fit within a single field access element? (datum)
390 * (i.e., without crossing a datum boundary)
391 */
392 if ((obj_desc->common_field.start_field_bit_offset +
393 field_bit_length) <= (u16) access_bit_width) {
394 obj_desc->common.flags |= AOPOBJ_SINGLE_DATUM;
395 }
396
397 return_ACPI_STATUS(AE_OK); 388 return_ACPI_STATUS(AE_OK);
398} 389}
399 390