diff options
Diffstat (limited to 'drivers/acpi/acpica/exconvrt.c')
-rw-r--r-- | drivers/acpi/acpica/exconvrt.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/drivers/acpi/acpica/exconvrt.c b/drivers/acpi/acpica/exconvrt.c index d2b9613bbf01..69e4a8cc9b71 100644 --- a/drivers/acpi/acpica/exconvrt.c +++ b/drivers/acpi/acpica/exconvrt.c | |||
@@ -99,6 +99,7 @@ acpi_ex_convert_to_integer(union acpi_operand_object *obj_desc, | |||
99 | break; | 99 | break; |
100 | 100 | ||
101 | default: | 101 | default: |
102 | |||
102 | return_ACPI_STATUS(AE_TYPE); | 103 | return_ACPI_STATUS(AE_TYPE); |
103 | } | 104 | } |
104 | 105 | ||
@@ -117,7 +118,6 @@ acpi_ex_convert_to_integer(union acpi_operand_object *obj_desc, | |||
117 | 118 | ||
118 | switch (obj_desc->common.type) { | 119 | switch (obj_desc->common.type) { |
119 | case ACPI_TYPE_STRING: | 120 | case ACPI_TYPE_STRING: |
120 | |||
121 | /* | 121 | /* |
122 | * Convert string to an integer - for most cases, the string must be | 122 | * Convert string to an integer - for most cases, the string must be |
123 | * hexadecimal as per the ACPI specification. The only exception (as | 123 | * hexadecimal as per the ACPI specification. The only exception (as |
@@ -161,6 +161,7 @@ acpi_ex_convert_to_integer(union acpi_operand_object *obj_desc, | |||
161 | default: | 161 | default: |
162 | 162 | ||
163 | /* No other types can get here */ | 163 | /* No other types can get here */ |
164 | |||
164 | break; | 165 | break; |
165 | } | 166 | } |
166 | 167 | ||
@@ -213,7 +214,6 @@ acpi_ex_convert_to_buffer(union acpi_operand_object *obj_desc, | |||
213 | return_ACPI_STATUS(AE_OK); | 214 | return_ACPI_STATUS(AE_OK); |
214 | 215 | ||
215 | case ACPI_TYPE_INTEGER: | 216 | case ACPI_TYPE_INTEGER: |
216 | |||
217 | /* | 217 | /* |
218 | * Create a new Buffer object. | 218 | * Create a new Buffer object. |
219 | * Need enough space for one integer | 219 | * Need enough space for one integer |
@@ -233,7 +233,6 @@ acpi_ex_convert_to_buffer(union acpi_operand_object *obj_desc, | |||
233 | break; | 233 | break; |
234 | 234 | ||
235 | case ACPI_TYPE_STRING: | 235 | case ACPI_TYPE_STRING: |
236 | |||
237 | /* | 236 | /* |
238 | * Create a new Buffer object | 237 | * Create a new Buffer object |
239 | * Size will be the string length | 238 | * Size will be the string length |
@@ -258,6 +257,7 @@ acpi_ex_convert_to_buffer(union acpi_operand_object *obj_desc, | |||
258 | break; | 257 | break; |
259 | 258 | ||
260 | default: | 259 | default: |
260 | |||
261 | return_ACPI_STATUS(AE_TYPE); | 261 | return_ACPI_STATUS(AE_TYPE); |
262 | } | 262 | } |
263 | 263 | ||
@@ -304,15 +304,18 @@ acpi_ex_convert_to_ascii(u64 integer, u16 base, u8 *string, u8 data_width) | |||
304 | 304 | ||
305 | switch (data_width) { | 305 | switch (data_width) { |
306 | case 1: | 306 | case 1: |
307 | |||
307 | decimal_length = ACPI_MAX8_DECIMAL_DIGITS; | 308 | decimal_length = ACPI_MAX8_DECIMAL_DIGITS; |
308 | break; | 309 | break; |
309 | 310 | ||
310 | case 4: | 311 | case 4: |
312 | |||
311 | decimal_length = ACPI_MAX32_DECIMAL_DIGITS; | 313 | decimal_length = ACPI_MAX32_DECIMAL_DIGITS; |
312 | break; | 314 | break; |
313 | 315 | ||
314 | case 8: | 316 | case 8: |
315 | default: | 317 | default: |
318 | |||
316 | decimal_length = ACPI_MAX64_DECIMAL_DIGITS; | 319 | decimal_length = ACPI_MAX64_DECIMAL_DIGITS; |
317 | break; | 320 | break; |
318 | } | 321 | } |
@@ -546,6 +549,7 @@ acpi_ex_convert_to_string(union acpi_operand_object * obj_desc, | |||
546 | break; | 549 | break; |
547 | 550 | ||
548 | default: | 551 | default: |
552 | |||
549 | return_ACPI_STATUS(AE_TYPE); | 553 | return_ACPI_STATUS(AE_TYPE); |
550 | } | 554 | } |
551 | 555 | ||
@@ -599,6 +603,7 @@ acpi_ex_convert_to_target_type(acpi_object_type destination_type, | |||
599 | break; | 603 | break; |
600 | 604 | ||
601 | default: | 605 | default: |
606 | |||
602 | /* No conversion allowed for these types */ | 607 | /* No conversion allowed for these types */ |
603 | 608 | ||
604 | if (destination_type != source_desc->common.type) { | 609 | if (destination_type != source_desc->common.type) { |
@@ -649,6 +654,7 @@ acpi_ex_convert_to_target_type(acpi_object_type destination_type, | |||
649 | break; | 654 | break; |
650 | 655 | ||
651 | default: | 656 | default: |
657 | |||
652 | ACPI_ERROR((AE_INFO, | 658 | ACPI_ERROR((AE_INFO, |
653 | "Bad destination type during conversion: 0x%X", | 659 | "Bad destination type during conversion: 0x%X", |
654 | destination_type)); | 660 | destination_type)); |
@@ -664,6 +670,7 @@ acpi_ex_convert_to_target_type(acpi_object_type destination_type, | |||
664 | break; | 670 | break; |
665 | 671 | ||
666 | default: | 672 | default: |
673 | |||
667 | ACPI_ERROR((AE_INFO, | 674 | ACPI_ERROR((AE_INFO, |
668 | "Unknown Target type ID 0x%X AmlOpcode 0x%X DestType %s", | 675 | "Unknown Target type ID 0x%X AmlOpcode 0x%X DestType %s", |
669 | GET_CURRENT_ARG_TYPE(walk_state->op_info-> | 676 | GET_CURRENT_ARG_TYPE(walk_state->op_info-> |