Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 5df7e6cb42da36c7d878239bebc81907b15f3943

Authored by Bob Moore
Committed by Len Brown
1 parent 091f4d7186
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

ACPICA: Remove obsolete ACPI_INTEGER (acpi_integer) type 

This type was introduced as the code was migrated from ACPI 1.0
(with 32-bit AML integers) to ACPI 2.0 (with 64-bit integers). It
is now obsolete and this change removes it from the ACPICA code
base, replaced by u64.  The original typedef has been retained
for now for compatibility with existing device driver code.

Signed-off-by: Bob Moore <robert.moore@intel.com>
Signed-off-by: Lin Ming <ming.m.lin@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>

Showing 33 changed files with 169 additions and 196 deletions Side-by-side Diff

drivers/acpi/acpica/acevents.h
Diff comments   View file @ 5df7e6c
... ... @@ -139,8 +139,7 @@
139 139 acpi_status
140 140 acpi_ev_address_space_dispatch(union acpi_operand_object *region_obj,
141 141 u32 function,
142   - u32 region_offset,
143   - u32 bit_width, acpi_integer * value);
  142 + u32 region_offset, u32 bit_width, u64 *value);
144 143  
145 144 acpi_status
146 145 acpi_ev_attach_region(union acpi_operand_object *handler_obj,
drivers/acpi/acpica/acinterp.h
Diff comments   View file @ 5df7e6c
... ... @@ -129,18 +129,17 @@
129 129  
130 130 acpi_status
131 131 acpi_ex_write_with_update_rule(union acpi_operand_object *obj_desc,
132   - acpi_integer mask,
133   - acpi_integer field_value,
134   - u32 field_datum_byte_offset);
  132 + u64 mask,
  133 + u64 field_value, u32 field_datum_byte_offset);
135 134  
136 135 void
137   -acpi_ex_get_buffer_datum(acpi_integer * datum,
  136 +acpi_ex_get_buffer_datum(u64 *datum,
138 137 void *buffer,
139 138 u32 buffer_length,
140 139 u32 byte_granularity, u32 buffer_offset);
141 140  
142 141 void
143   -acpi_ex_set_buffer_datum(acpi_integer merged_datum,
  142 +acpi_ex_set_buffer_datum(u64 merged_datum,
144 143 void *buffer,
145 144 u32 buffer_length,
146 145 u32 byte_granularity, u32 buffer_offset);
... ... @@ -168,8 +167,7 @@
168 167  
169 168 acpi_status
170 169 acpi_ex_access_region(union acpi_operand_object *obj_desc,
171   - u32 field_datum_byte_offset,
172   - acpi_integer * value, u32 read_write);
  170 + u32 field_datum_byte_offset, u64 *value, u32 read_write);
173 171  
174 172 /*
175 173 * exmisc - misc support routines
176 174  
177 175  
... ... @@ -193,16 +191,14 @@
193 191  
194 192 acpi_status
195 193 acpi_ex_do_logical_numeric_op(u16 opcode,
196   - acpi_integer integer0,
197   - acpi_integer integer1, u8 * logical_result);
  194 + u64 integer0, u64 integer1, u8 *logical_result);
198 195  
199 196 acpi_status
200 197 acpi_ex_do_logical_op(u16 opcode,
201 198 union acpi_operand_object *operand0,
202   - union acpi_operand_object *operand1, u8 * logical_result);
  199 + union acpi_operand_object *operand1, u8 *logical_result);
203 200  
204   -acpi_integer
205   -acpi_ex_do_math_op(u16 opcode, acpi_integer operand0, acpi_integer operand1);
  201 +u64 acpi_ex_do_math_op(u16 opcode, u64 operand0, u64 operand1);
206 202  
207 203 acpi_status acpi_ex_create_mutex(struct acpi_walk_state *walk_state);
208 204  
... ... @@ -278,7 +274,7 @@
278 274 acpi_ex_system_do_notify_op(union acpi_operand_object *value,
279 275 union acpi_operand_object *obj_desc);
280 276  
281   -acpi_status acpi_ex_system_do_suspend(acpi_integer time);
  277 +acpi_status acpi_ex_system_do_suspend(u64 time);
282 278  
283 279 acpi_status acpi_ex_system_do_stall(u32 time);
284 280  
285 281  
... ... @@ -461,9 +457,9 @@
461 457  
462 458 void acpi_ex_release_global_lock(u32 rule);
463 459  
464   -void acpi_ex_eisa_id_to_string(char *dest, acpi_integer compressed_id);
  460 +void acpi_ex_eisa_id_to_string(char *dest, u64 compressed_id);
465 461  
466   -void acpi_ex_integer_to_string(char *dest, acpi_integer value);
  462 +void acpi_ex_integer_to_string(char *dest, u64 value);
467 463  
468 464 /*
469 465 * exregion - default op_region handlers
... ... @@ -472,7 +468,7 @@
472 468 acpi_ex_system_memory_space_handler(u32 function,
473 469 acpi_physical_address address,
474 470 u32 bit_width,
475   - acpi_integer * value,
  471 + u64 *value,
476 472 void *handler_context,
477 473 void *region_context);
478 474  
479 475  
480 476  
481 477  
482 478  
... ... @@ -480,35 +476,35 @@
480 476 acpi_ex_system_io_space_handler(u32 function,
481 477 acpi_physical_address address,
482 478 u32 bit_width,
483   - acpi_integer * value,
  479 + u64 *value,
484 480 void *handler_context, void *region_context);
485 481  
486 482 acpi_status
487 483 acpi_ex_pci_config_space_handler(u32 function,
488 484 acpi_physical_address address,
489 485 u32 bit_width,
490   - acpi_integer * value,
  486 + u64 *value,
491 487 void *handler_context, void *region_context);
492 488  
493 489 acpi_status
494 490 acpi_ex_cmos_space_handler(u32 function,
495 491 acpi_physical_address address,
496 492 u32 bit_width,
497   - acpi_integer * value,
  493 + u64 *value,
498 494 void *handler_context, void *region_context);
499 495  
500 496 acpi_status
501 497 acpi_ex_pci_bar_space_handler(u32 function,
502 498 acpi_physical_address address,
503 499 u32 bit_width,
504   - acpi_integer * value,
  500 + u64 *value,
505 501 void *handler_context, void *region_context);
506 502  
507 503 acpi_status
508 504 acpi_ex_embedded_controller_space_handler(u32 function,
509 505 acpi_physical_address address,
510 506 u32 bit_width,
511   - acpi_integer * value,
  507 + u64 *value,
512 508 void *handler_context,
513 509 void *region_context);
514 510  
515 511  
... ... @@ -516,14 +512,14 @@
516 512 acpi_ex_sm_bus_space_handler(u32 function,
517 513 acpi_physical_address address,
518 514 u32 bit_width,
519   - acpi_integer * value,
  515 + u64 *value,
520 516 void *handler_context, void *region_context);
521 517  
522 518 acpi_status
523 519 acpi_ex_data_table_space_handler(u32 function,
524 520 acpi_physical_address address,
525 521 u32 bit_width,
526   - acpi_integer * value,
  522 + u64 *value,
527 523 void *handler_context, void *region_context);
528 524  
529 525 #endif /* __INTERP_H__ */
drivers/acpi/acpica/aclocal.h
Diff comments   View file @ 5df7e6c
... ... @@ -650,7 +650,7 @@
650 650 };
651 651  
652 652 union acpi_parse_value {
653   - acpi_integer integer; /* Integer constant (Up to 64 bits) */
  653 + u64 integer; /* Integer constant (Up to 64 bits) */
654 654 struct uint64_struct integer64; /* Structure overlay for 2 32-bit Dwords */
655 655 u32 size; /* bytelist or field size */
656 656 char *string; /* NULL terminated string */
drivers/acpi/acpica/acmacros.h
Diff comments   View file @ 5df7e6c
... ... @@ -272,8 +272,8 @@
272 272 * MASK_BITS_ABOVE creates a mask starting AT the position and above
273 273 * MASK_BITS_BELOW creates a mask starting one bit BELOW the position
274 274 */
275   -#define ACPI_MASK_BITS_ABOVE(position) (~((ACPI_INTEGER_MAX) << ((u32) (position))))
276   -#define ACPI_MASK_BITS_BELOW(position) ((ACPI_INTEGER_MAX) << ((u32) (position)))
  275 +#define ACPI_MASK_BITS_ABOVE(position) (~((ACPI_UINT64_MAX) << ((u32) (position))))
  276 +#define ACPI_MASK_BITS_BELOW(position) ((ACPI_UINT64_MAX) << ((u32) (position)))
277 277  
278 278 /* Bitfields within ACPI registers */
279 279  
280 280  
281 281  
... ... @@ -414,16 +414,16 @@
414 414 acpi_ut_ptr_exit (ACPI_DEBUG_PARAMETERS, (u8 *) _s); \
415 415 return (_s); })
416 416 #define return_VALUE(s) ACPI_DO_WHILE0 ({ \
417   - register acpi_integer _s = (s); \
  417 + register u64 _s = (s); \
418 418 acpi_ut_value_exit (ACPI_DEBUG_PARAMETERS, _s); \
419 419 return (_s); })
420 420 #define return_UINT8(s) ACPI_DO_WHILE0 ({ \
421 421 register u8 _s = (u8) (s); \
422   - acpi_ut_value_exit (ACPI_DEBUG_PARAMETERS, (acpi_integer) _s); \
  422 + acpi_ut_value_exit (ACPI_DEBUG_PARAMETERS, (u64) _s); \
423 423 return (_s); })
424 424 #define return_UINT32(s) ACPI_DO_WHILE0 ({ \
425 425 register u32 _s = (u32) (s); \
426   - acpi_ut_value_exit (ACPI_DEBUG_PARAMETERS, (acpi_integer) _s); \
  426 + acpi_ut_value_exit (ACPI_DEBUG_PARAMETERS, (u64) _s); \
427 427 return (_s); })
428 428 #else /* Use original less-safe macros */
429 429  
... ... @@ -434,7 +434,7 @@
434 434 acpi_ut_ptr_exit (ACPI_DEBUG_PARAMETERS, (u8 *) (s)); \
435 435 return((s)); })
436 436 #define return_VALUE(s) ACPI_DO_WHILE0 ({ \
437   - acpi_ut_value_exit (ACPI_DEBUG_PARAMETERS, (acpi_integer) (s)); \
  437 + acpi_ut_value_exit (ACPI_DEBUG_PARAMETERS, (u64) (s)); \
438 438 return((s)); })
439 439 #define return_UINT8(s) return_VALUE(s)
440 440 #define return_UINT32(s) return_VALUE(s)
drivers/acpi/acpica/acobject.h
Diff comments   View file @ 5df7e6c
... ... @@ -111,7 +111,7 @@
111 111  
112 112 struct acpi_object_integer {
113 113 ACPI_OBJECT_COMMON_HEADER u8 fill[3]; /* Prevent warning on some compilers */
114   - acpi_integer value;
  114 + u64 value;
115 115 };
116 116  
117 117 /*
drivers/acpi/acpica/acutils.h
Diff comments   View file @ 5df7e6c
... ... @@ -134,7 +134,7 @@
134 134  
135 135 char *acpi_ut_get_event_name(u32 event_id);
136 136  
137   -char acpi_ut_hex_to_ascii_char(acpi_integer integer, u32 position);
  137 +char acpi_ut_hex_to_ascii_char(u64 integer, u32 position);
138 138  
139 139 u8 acpi_ut_valid_object_type(acpi_object_type type);
140 140  
... ... @@ -279,8 +279,7 @@
279 279 void
280 280 acpi_ut_value_exit(u32 line_number,
281 281 const char *function_name,
282   - const char *module_name,
283   - u32 component_id, acpi_integer value);
  282 + const char *module_name, u32 component_id, u64 value);
284 283  
285 284 void
286 285 acpi_ut_ptr_exit(u32 line_number,
... ... @@ -324,7 +323,7 @@
324 323 acpi_status
325 324 acpi_ut_evaluate_numeric_object(char *object_name,
326 325 struct acpi_namespace_node *device_node,
327   - acpi_integer *value);
  326 + u64 *value);
328 327  
329 328 acpi_status
330 329 acpi_ut_execute_STA(struct acpi_namespace_node *device_node, u32 *status_flags);
331 330  
... ... @@ -437,14 +436,12 @@
437 436 * utmath
438 437 */
439 438 acpi_status
440   -acpi_ut_divide(acpi_integer in_dividend,
441   - acpi_integer in_divisor,
442   - acpi_integer * out_quotient, acpi_integer * out_remainder);
  439 +acpi_ut_divide(u64 in_dividend,
  440 + u64 in_divisor, u64 *out_quotient, u64 *out_remainder);
443 441  
444 442 acpi_status
445   -acpi_ut_short_divide(acpi_integer in_dividend,
446   - u32 divisor,
447   - acpi_integer * out_quotient, u32 * out_remainder);
  443 +acpi_ut_short_divide(u64 in_dividend,
  444 + u32 divisor, u64 *out_quotient, u32 *out_remainder);
448 445  
449 446 /*
450 447 * utmisc
... ... @@ -474,8 +471,7 @@
474 471  
475 472 u8 acpi_ut_valid_acpi_char(char character, u32 position);
476 473  
477   -acpi_status
478   -acpi_ut_strtoul64(char *string, u32 base, acpi_integer * ret_integer);
  474 +acpi_status acpi_ut_strtoul64(char *string, u32 base, u64 * ret_integer);
479 475  
480 476 void ACPI_INTERNAL_VAR_XFACE
481 477 acpi_ut_predefined_warning(const char *module_name,
drivers/acpi/acpica/dsfield.c
Diff comments   View file @ 5df7e6c
... ... @@ -220,7 +220,7 @@
220 220 union acpi_parse_object *arg)
221 221 {
222 222 acpi_status status;
223   - acpi_integer position;
  223 + u64 position;
224 224  
225 225 ACPI_FUNCTION_TRACE_PTR(ds_get_field_names, info);
226 226  
... ... @@ -240,8 +240,8 @@
240 240 switch (arg->common.aml_opcode) {
241 241 case AML_INT_RESERVEDFIELD_OP:
242 242  
243   - position = (acpi_integer) info->field_bit_position
244   - + (acpi_integer) arg->common.value.size;
  243 + position = (u64) info->field_bit_position
  244 + + (u64) arg->common.value.size;
245 245  
246 246 if (position > ACPI_UINT32_MAX) {
247 247 ACPI_ERROR((AE_INFO,
... ... @@ -305,8 +305,8 @@
305 305  
306 306 /* Keep track of bit position for the next field */
307 307  
308   - position = (acpi_integer) info->field_bit_position
309   - + (acpi_integer) arg->common.value.size;
  308 + position = (u64) info->field_bit_position
  309 + + (u64) arg->common.value.size;
310 310  
311 311 if (position > ACPI_UINT32_MAX) {
312 312 ACPI_ERROR((AE_INFO,
drivers/acpi/acpica/dsobject.c
Diff comments   View file @ 5df7e6c
... ... @@ -684,7 +684,7 @@
684 684  
685 685 case AML_ONES_OP:
686 686  
687   - obj_desc->integer.value = ACPI_INTEGER_MAX;
  687 + obj_desc->integer.value = ACPI_UINT64_MAX;
688 688  
689 689 /* Truncate value if we are executing from a 32-bit ACPI table */
690 690  
drivers/acpi/acpica/evregion.c
Diff comments   View file @ 5df7e6c
... ... @@ -329,7 +329,7 @@
329 329 * region_offset - Where in the region to read or write
330 330 * bit_width - Field width in bits (8, 16, 32, or 64)
331 331 * Value - Pointer to in or out value, must be
332   - * full 64-bit acpi_integer
  332 + * a full 64-bit integer
333 333 *
334 334 * RETURN: Status
335 335 *
... ... @@ -341,8 +341,7 @@
341 341 acpi_status
342 342 acpi_ev_address_space_dispatch(union acpi_operand_object *region_obj,
343 343 u32 function,
344   - u32 region_offset,
345   - u32 bit_width, acpi_integer * value)
  344 + u32 region_offset, u32 bit_width, u64 *value)
346 345 {
347 346 acpi_status status;
348 347 acpi_adr_space_handler handler;
drivers/acpi/acpica/evrgnini.c
Diff comments   View file @ 5df7e6c
... ... @@ -168,7 +168,7 @@
168 168 void *handler_context, void **region_context)
169 169 {
170 170 acpi_status status = AE_OK;
171   - acpi_integer pci_value;
  171 + u64 pci_value;
172 172 struct acpi_pci_id *pci_id = *region_context;
173 173 union acpi_operand_object *handler_obj;
174 174 struct acpi_namespace_node *parent_node;
drivers/acpi/acpica/exconfig.c
Diff comments   View file @ 5df7e6c
... ... @@ -284,7 +284,7 @@
284 284 acpi_ex_region_read(union acpi_operand_object *obj_desc, u32 length, u8 *buffer)
285 285 {
286 286 acpi_status status;
287   - acpi_integer value;
  287 + u64 value;
288 288 u32 region_offset = 0;
289 289 u32 i;
290 290  
drivers/acpi/acpica/exconvrt.c
Diff comments   View file @ 5df7e6c
... ... @@ -51,8 +51,7 @@
51 51  
52 52 /* Local prototypes */
53 53 static u32
54   -acpi_ex_convert_to_ascii(acpi_integer integer,
55   - u16 base, u8 * string, u8 max_length);
  54 +acpi_ex_convert_to_ascii(u64 integer, u16 base, u8 *string, u8 max_length);
56 55  
57 56 /*******************************************************************************
58 57 *
... ... @@ -75,7 +74,7 @@
75 74 {
76 75 union acpi_operand_object *return_desc;
77 76 u8 *pointer;
78   - acpi_integer result;
  77 + u64 result;
79 78 u32 i;
80 79 u32 count;
81 80 acpi_status status;
... ... @@ -155,7 +154,7 @@
155 154 * Little endian is used, meaning that the first byte of the buffer
156 155 * is the LSB of the integer
157 156 */
158   - result |= (((acpi_integer) pointer[i]) << (i * 8));
  157 + result |= (((u64) pointer[i]) << (i * 8));
159 158 }
160 159 break;
161 160  
162 161  
... ... @@ -285,10 +284,9 @@
285 284 ******************************************************************************/
286 285  
287 286 static u32
288   -acpi_ex_convert_to_ascii(acpi_integer integer,
289   - u16 base, u8 * string, u8 data_width)
  287 +acpi_ex_convert_to_ascii(u64 integer, u16 base, u8 *string, u8 data_width)
290 288 {
291   - acpi_integer digit;
  289 + u64 digit;
292 290 u32 i;
293 291 u32 j;
294 292 u32 k = 0;
... ... @@ -531,10 +529,9 @@
531 529 * (separated by commas or spaces)
532 530 */
533 531 for (i = 0; i < obj_desc->buffer.length; i++) {
534   - new_buf += acpi_ex_convert_to_ascii((acpi_integer)
535   - obj_desc->buffer.
536   - pointer[i], base,
537   - new_buf, 1);
  532 + new_buf += acpi_ex_convert_to_ascii((u64) obj_desc->
  533 + buffer.pointer[i],
  534 + base, new_buf, 1);
538 535 *new_buf++ = separator; /* each separated by a comma or space */
539 536 }
540 537  
drivers/acpi/acpica/exfield.c
Diff comments   View file @ 5df7e6c
... ... @@ -130,7 +130,7 @@
130 130 /* Call the region handler for the read */
131 131  
132 132 status = acpi_ex_access_region(obj_desc, 0,
133   - ACPI_CAST_PTR(acpi_integer,
  133 + ACPI_CAST_PTR(u64,
134 134 buffer_desc->
135 135 buffer.pointer),
136 136 function);
... ... @@ -141,7 +141,7 @@
141 141 /*
142 142 * Allocate a buffer for the contents of the field.
143 143 *
144   - * If the field is larger than the size of an acpi_integer, create
  144 + * If the field is larger than the current integer width, create
145 145 * a BUFFER to hold it. Otherwise, use an INTEGER. This allows
146 146 * the use of arithmetic operators on the returned value if the
147 147 * field size is equal or smaller than an Integer.
... ... @@ -306,8 +306,7 @@
306 306 * same buffer)
307 307 */
308 308 status = acpi_ex_access_region(obj_desc, 0,
309   - (acpi_integer *) buffer,
310   - function);
  309 + (u64 *) buffer, function);
311 310 acpi_ex_release_global_lock(obj_desc->common_field.field_flags);
312 311  
313 312 *result_desc = buffer_desc;
drivers/acpi/acpica/exfldio.c
Diff comments   View file @ 5df7e6c
... ... @@ -55,11 +55,10 @@
55 55 static acpi_status
56 56 acpi_ex_field_datum_io(union acpi_operand_object *obj_desc,
57 57 u32 field_datum_byte_offset,
58   - acpi_integer * value, u32 read_write);
  58 + u64 *value, u32 read_write);
59 59  
60 60 static u8
61   -acpi_ex_register_overflow(union acpi_operand_object *obj_desc,
62   - acpi_integer value);
  61 +acpi_ex_register_overflow(union acpi_operand_object *obj_desc, u64 value);
63 62  
64 63 static acpi_status
65 64 acpi_ex_setup_region(union acpi_operand_object *obj_desc,
... ... @@ -212,7 +211,7 @@
212 211 * field_datum_byte_offset - Byte offset of this datum within the
213 212 * parent field
214 213 * Value - Where to store value (must at least
215   - * the size of acpi_integer)
  214 + * 64 bits)
216 215 * Function - Read or Write flag plus other region-
217 216 * dependent flags
218 217 *
... ... @@ -224,8 +223,7 @@
224 223  
225 224 acpi_status
226 225 acpi_ex_access_region(union acpi_operand_object *obj_desc,
227   - u32 field_datum_byte_offset,
228   - acpi_integer * value, u32 function)
  226 + u32 field_datum_byte_offset, u64 *value, u32 function)
229 227 {
230 228 acpi_status status;
231 229 union acpi_operand_object *rgn_desc;
... ... @@ -317,8 +315,7 @@
317 315 ******************************************************************************/
318 316  
319 317 static u8
320   -acpi_ex_register_overflow(union acpi_operand_object *obj_desc,
321   - acpi_integer value)
  318 +acpi_ex_register_overflow(union acpi_operand_object *obj_desc, u64 value)
322 319 {
323 320  
324 321 if (obj_desc->common_field.bit_length >= ACPI_INTEGER_BIT_SIZE) {
... ... @@ -329,7 +326,7 @@
329 326 return (FALSE);
330 327 }
331 328  
332   - if (value >= ((acpi_integer) 1 << obj_desc->common_field.bit_length)) {
  329 + if (value >= ((u64) 1 << obj_desc->common_field.bit_length)) {
333 330 /*
334 331 * The Value is larger than the maximum value that can fit into
335 332 * the register.
336 333  
... ... @@ -362,11 +359,10 @@
362 359  
363 360 static acpi_status
364 361 acpi_ex_field_datum_io(union acpi_operand_object *obj_desc,
365   - u32 field_datum_byte_offset,
366   - acpi_integer * value, u32 read_write)
  362 + u32 field_datum_byte_offset, u64 *value, u32 read_write)
367 363 {
368 364 acpi_status status;
369   - acpi_integer local_value;
  365 + u64 local_value;
370 366  
371 367 ACPI_FUNCTION_TRACE_U32(ex_field_datum_io, field_datum_byte_offset);
372 368  
... ... @@ -439,8 +435,8 @@
439 435 * the register
440 436 */
441 437 if (acpi_ex_register_overflow(obj_desc->bank_field.bank_obj,
442   - (acpi_integer) obj_desc->
443   - bank_field.value)) {
  438 + (u64) obj_desc->bank_field.
  439 + value)) {
444 440 return_ACPI_STATUS(AE_AML_REGISTER_LIMIT);
445 441 }
446 442  
... ... @@ -481,8 +477,8 @@
481 477 * the register
482 478 */
483 479 if (acpi_ex_register_overflow(obj_desc->index_field.index_obj,
484   - (acpi_integer) obj_desc->
485   - index_field.value)) {
  480 + (u64) obj_desc->index_field.
  481 + value)) {
486 482 return_ACPI_STATUS(AE_AML_REGISTER_LIMIT);
487 483 }
488 484  
... ... @@ -512,7 +508,7 @@
512 508 status =
513 509 acpi_ex_extract_from_field(obj_desc->index_field.
514 510 data_obj, value,
515   - sizeof(acpi_integer));
  511 + sizeof(u64));
516 512 } else {
517 513 /* Write the datum to the data_register */
518 514  
... ... @@ -523,7 +519,7 @@
523 519 status =
524 520 acpi_ex_insert_into_field(obj_desc->index_field.
525 521 data_obj, value,
526   - sizeof(acpi_integer));
  522 + sizeof(u64));
527 523 }
528 524 break;
529 525  
530 526  
... ... @@ -571,13 +567,12 @@
571 567  
572 568 acpi_status
573 569 acpi_ex_write_with_update_rule(union acpi_operand_object *obj_desc,
574   - acpi_integer mask,
575   - acpi_integer field_value,
576   - u32 field_datum_byte_offset)
  570 + u64 mask,
  571 + u64 field_value, u32 field_datum_byte_offset)
577 572 {
578 573 acpi_status status = AE_OK;
579   - acpi_integer merged_value;
580   - acpi_integer current_value;
  574 + u64 merged_value;
  575 + u64 current_value;
581 576  
582 577 ACPI_FUNCTION_TRACE_U32(ex_write_with_update_rule, mask);
583 578  
... ... @@ -587,7 +582,7 @@
587 582  
588 583 /* If the mask is all ones, we don't need to worry about the update rule */
589 584  
590   - if (mask != ACPI_INTEGER_MAX) {
  585 + if (mask != ACPI_UINT64_MAX) {
591 586  
592 587 /* Decode the update rule */
593 588  
... ... @@ -678,8 +673,8 @@
678 673 void *buffer, u32 buffer_length)
679 674 {
680 675 acpi_status status;
681   - acpi_integer raw_datum;
682   - acpi_integer merged_datum;
  676 + u64 raw_datum;
  677 + u64 merged_datum;
683 678 u32 field_offset = 0;
684 679 u32 buffer_offset = 0;
685 680 u32 buffer_tail_bits;
... ... @@ -804,10 +799,10 @@
804 799 void *buffer, u32 buffer_length)
805 800 {
806 801 acpi_status status;
807   - acpi_integer mask;
808   - acpi_integer width_mask;
809   - acpi_integer merged_datum;
810   - acpi_integer raw_datum = 0;
  802 + u64 mask;
  803 + u64 width_mask;
  804 + u64 merged_datum;
  805 + u64 raw_datum = 0;
811 806 u32 field_offset = 0;
812 807 u32 buffer_offset = 0;
813 808 u32 buffer_tail_bits;
... ... @@ -855,7 +850,7 @@
855 850 * shift operator
856 851 */
857 852 if (obj_desc->common_field.access_bit_width == ACPI_INTEGER_BIT_SIZE) {
858   - width_mask = ACPI_INTEGER_MAX;
  853 + width_mask = ACPI_UINT64_MAX;
859 854 } else {
860 855 width_mask =
861 856 ACPI_MASK_BITS_ABOVE(obj_desc->common_field.
drivers/acpi/acpica/exmisc.c
Diff comments   View file @ 5df7e6c
... ... @@ -409,8 +409,7 @@
409 409 *
410 410 ******************************************************************************/
411 411  
412   -acpi_integer
413   -acpi_ex_do_math_op(u16 opcode, acpi_integer integer0, acpi_integer integer1)
  412 +u64 acpi_ex_do_math_op(u16 opcode, u64 integer0, u64 integer1)
414 413 {
415 414  
416 415 ACPI_FUNCTION_ENTRY();
... ... @@ -498,8 +497,7 @@
498 497  
499 498 acpi_status
500 499 acpi_ex_do_logical_numeric_op(u16 opcode,
501   - acpi_integer integer0,
502   - acpi_integer integer1, u8 * logical_result)
  500 + u64 integer0, u64 integer1, u8 *logical_result)
503 501 {
504 502 acpi_status status = AE_OK;
505 503 u8 local_result = FALSE;
... ... @@ -564,8 +562,8 @@
564 562 union acpi_operand_object *operand1, u8 * logical_result)
565 563 {
566 564 union acpi_operand_object *local_operand1 = operand1;
567   - acpi_integer integer0;
568   - acpi_integer integer1;
  565 + u64 integer0;
  566 + u64 integer1;
569 567 u32 length0;
570 568 u32 length1;
571 569 acpi_status status = AE_OK;
drivers/acpi/acpica/exoparg1.c
Diff comments   View file @ 5df7e6c
... ... @@ -261,8 +261,8 @@
261 261 union acpi_operand_object *return_desc2 = NULL;
262 262 u32 temp32;
263 263 u32 i;
264   - acpi_integer power_of_ten;
265   - acpi_integer digit;
  264 + u64 power_of_ten;
  265 + u64 digit;
266 266  
267 267 ACPI_FUNCTION_TRACE_STR(ex_opcode_1A_1T_1R,
268 268 acpi_ps_get_opcode_name(walk_state->opcode));
... ... @@ -362,7 +362,7 @@
362 362 /* Sum the digit into the result with the current power of 10 */
363 363  
364 364 return_desc->integer.value +=
365   - (((acpi_integer) temp32) * power_of_ten);
  365 + (((u64) temp32) * power_of_ten);
366 366  
367 367 /* Shift to next BCD digit */
368 368  
... ... @@ -392,7 +392,7 @@
392 392 * remainder from above
393 393 */
394 394 return_desc->integer.value |=
395   - (((acpi_integer) temp32) << ACPI_MUL_4(i));
  395 + (((u64) temp32) << ACPI_MUL_4(i));
396 396 }
397 397  
398 398 /* Overflow if there is any data left in Digit */
... ... @@ -439,7 +439,7 @@
439 439  
440 440 /* The object exists in the namespace, return TRUE */
441 441  
442   - return_desc->integer.value = ACPI_INTEGER_MAX;
  442 + return_desc->integer.value = ACPI_UINT64_MAX;
443 443 goto cleanup;
444 444  
445 445 default:
... ... @@ -589,7 +589,7 @@
589 589 union acpi_operand_object *return_desc = NULL;
590 590 acpi_status status = AE_OK;
591 591 u32 type;
592   - acpi_integer value;
  592 + u64 value;
593 593  
594 594 ACPI_FUNCTION_TRACE_STR(ex_opcode_1A_0T_1R,
595 595 acpi_ps_get_opcode_name(walk_state->opcode));
... ... @@ -610,7 +610,7 @@
610 610 * return_desc->Integer.Value is initially == 0 (FALSE) from above.
611 611 */
612 612 if (!operand[0]->integer.value) {
613   - return_desc->integer.value = ACPI_INTEGER_MAX;
  613 + return_desc->integer.value = ACPI_UINT64_MAX;
614 614 }
615 615 break;
616 616  
drivers/acpi/acpica/exoparg2.c
Diff comments   View file @ 5df7e6c
... ... @@ -282,7 +282,7 @@
282 282 {
283 283 union acpi_operand_object **operand = &walk_state->operands[0];
284 284 union acpi_operand_object *return_desc = NULL;
285   - acpi_integer index;
  285 + u64 index;
286 286 acpi_status status = AE_OK;
287 287 acpi_size length;
288 288  
... ... @@ -584,7 +584,7 @@
584 584 * Default is FALSE (zero)
585 585 */
586 586 if (logical_result) {
587   - return_desc->integer.value = ACPI_INTEGER_MAX;
  587 + return_desc->integer.value = ACPI_UINT64_MAX;
588 588 }
589 589  
590 590 cleanup:
drivers/acpi/acpica/exoparg3.c
Diff comments   View file @ 5df7e6c
... ... @@ -148,7 +148,7 @@
148 148 union acpi_operand_object *return_desc = NULL;
149 149 char *buffer = NULL;
150 150 acpi_status status = AE_OK;
151   - acpi_integer index;
  151 + u64 index;
152 152 acpi_size length;
153 153  
154 154 ACPI_FUNCTION_TRACE_STR(ex_opcode_3A_1T_1R,
drivers/acpi/acpica/exoparg6.c
Diff comments   View file @ 5df7e6c
... ... @@ -218,7 +218,7 @@
218 218 union acpi_operand_object **operand = &walk_state->operands[0];
219 219 union acpi_operand_object *return_desc = NULL;
220 220 acpi_status status = AE_OK;
221   - acpi_integer index;
  221 + u64 index;
222 222 union acpi_operand_object *this_element;
223 223  
224 224 ACPI_FUNCTION_TRACE_STR(ex_opcode_6A_0T_1R,
225 225  
... ... @@ -253,9 +253,9 @@
253 253 }
254 254  
255 255 /* Create an integer for the return value */
256   - /* Default return value is ACPI_INTEGER_MAX if no match found */
  256 + /* Default return value is ACPI_UINT64_MAX if no match found */
257 257  
258   - return_desc = acpi_ut_create_integer_object(ACPI_INTEGER_MAX);
  258 + return_desc = acpi_ut_create_integer_object(ACPI_UINT64_MAX);
259 259 if (!return_desc) {
260 260 status = AE_NO_MEMORY;
261 261 goto cleanup;
... ... @@ -270,7 +270,7 @@
270 270 *
271 271 * Upon finding a match, the loop will terminate via "break" at
272 272 * the bottom. If it terminates "normally", match_value will be
273   - * ACPI_INTEGER_MAX (Ones) (its initial value) indicating that no
  273 + * ACPI_UINT64_MAX (Ones) (its initial value) indicating that no
274 274 * match was found.
275 275 */
276 276 for (; index < operand[0]->package.count; index++) {
drivers/acpi/acpica/exregion.c
Diff comments   View file @ 5df7e6c
... ... @@ -70,7 +70,7 @@
70 70 acpi_ex_system_memory_space_handler(u32 function,
71 71 acpi_physical_address address,
72 72 u32 bit_width,
73   - acpi_integer * value,
  73 + u64 *value,
74 74 void *handler_context, void *region_context)
75 75 {
76 76 acpi_status status = AE_OK;
... ... @@ -115,8 +115,7 @@
115 115 * Hardware does not support non-aligned data transfers, we must verify
116 116 * the request.
117 117 */
118   - (void)acpi_ut_short_divide((acpi_integer) address, length, NULL,
119   - &remainder);
  118 + (void)acpi_ut_short_divide((u64) address, length, NULL, &remainder);
120 119 if (remainder != 0) {
121 120 return_ACPI_STATUS(AE_AML_ALIGNMENT);
122 121 }
... ... @@ -128,10 +127,9 @@
128 127 * 2) Address beyond the current mapping?
129 128 */
130 129 if ((address < mem_info->mapped_physical_address) ||
131   - (((acpi_integer) address + length) > ((acpi_integer)
132   - mem_info->
133   - mapped_physical_address +
134   - mem_info->mapped_length))) {
  130 + (((u64) address + length) > ((u64)
  131 + mem_info->mapped_physical_address +
  132 + mem_info->mapped_length))) {
135 133 /*
136 134 * The request cannot be resolved by the current memory mapping;
137 135 * Delete the existing mapping and create a new one.
... ... @@ -193,8 +191,7 @@
193 191 * access
194 192 */
195 193 logical_addr_ptr = mem_info->mapped_logical_address +
196   - ((acpi_integer) address -
197   - (acpi_integer) mem_info->mapped_physical_address);
  194 + ((u64) address - (u64) mem_info->mapped_physical_address);
198 195  
199 196 ACPI_DEBUG_PRINT((ACPI_DB_INFO,
200 197 "System-Memory (width %d) R/W %d Address=%8.8X%8.8X\n",
201 198  
202 199  
203 200  
... ... @@ -215,19 +212,19 @@
215 212 *value = 0;
216 213 switch (bit_width) {
217 214 case 8:
218   - *value = (acpi_integer) ACPI_GET8(logical_addr_ptr);
  215 + *value = (u64) ACPI_GET8(logical_addr_ptr);
219 216 break;
220 217  
221 218 case 16:
222   - *value = (acpi_integer) ACPI_GET16(logical_addr_ptr);
  219 + *value = (u64) ACPI_GET16(logical_addr_ptr);
223 220 break;
224 221  
225 222 case 32:
226   - *value = (acpi_integer) ACPI_GET32(logical_addr_ptr);
  223 + *value = (u64) ACPI_GET32(logical_addr_ptr);
227 224 break;
228 225  
229 226 case 64:
230   - *value = (acpi_integer) ACPI_GET64(logical_addr_ptr);
  227 + *value = (u64) ACPI_GET64(logical_addr_ptr);
231 228 break;
232 229  
233 230 default:
... ... @@ -291,7 +288,7 @@
291 288 acpi_ex_system_io_space_handler(u32 function,
292 289 acpi_physical_address address,
293 290 u32 bit_width,
294   - acpi_integer * value,
  291 + u64 *value,
295 292 void *handler_context, void *region_context)
296 293 {
297 294 acpi_status status = AE_OK;
... ... @@ -350,7 +347,7 @@
350 347 acpi_ex_pci_config_space_handler(u32 function,
351 348 acpi_physical_address address,
352 349 u32 bit_width,
353   - acpi_integer * value,
  350 + u64 *value,
354 351 void *handler_context, void *region_context)
355 352 {
356 353 acpi_status status = AE_OK;
... ... @@ -425,7 +422,7 @@
425 422 acpi_ex_cmos_space_handler(u32 function,
426 423 acpi_physical_address address,
427 424 u32 bit_width,
428   - acpi_integer * value,
  425 + u64 *value,
429 426 void *handler_context, void *region_context)
430 427 {
431 428 acpi_status status = AE_OK;
... ... @@ -457,7 +454,7 @@
457 454 acpi_ex_pci_bar_space_handler(u32 function,
458 455 acpi_physical_address address,
459 456 u32 bit_width,
460   - acpi_integer * value,
  457 + u64 *value,
461 458 void *handler_context, void *region_context)
462 459 {
463 460 acpi_status status = AE_OK;
... ... @@ -489,7 +486,7 @@
489 486 acpi_ex_data_table_space_handler(u32 function,
490 487 acpi_physical_address address,
491 488 u32 bit_width,
492   - acpi_integer * value,
  489 + u64 *value,
493 490 void *handler_context, void *region_context)
494 491 {
495 492 ACPI_FUNCTION_TRACE(ex_data_table_space_handler);
drivers/acpi/acpica/exsystem.c
Diff comments   View file @ 5df7e6c
... ... @@ -193,7 +193,7 @@
193 193 *
194 194 ******************************************************************************/
195 195  
196   -acpi_status acpi_ex_system_do_suspend(acpi_integer how_long)
  196 +acpi_status acpi_ex_system_do_suspend(u64 how_long)
197 197 {
198 198 ACPI_FUNCTION_ENTRY();
199 199  
drivers/acpi/acpica/exutils.c
Diff comments   View file @ 5df7e6c
... ... @@ -67,7 +67,7 @@
67 67 ACPI_MODULE_NAME("exutils")
68 68  
69 69 /* Local prototypes */
70   -static u32 acpi_ex_digits_needed(acpi_integer value, u32 base);
  70 +static u32 acpi_ex_digits_needed(u64 value, u32 base);
71 71  
72 72 #ifndef ACPI_NO_METHOD_EXECUTION
73 73 /*******************************************************************************
... ... @@ -230,7 +230,7 @@
230 230 * We are running a method that exists in a 32-bit ACPI table.
231 231 * Truncate the value to 32 bits by zeroing out the upper 32-bit field
232 232 */
233   - obj_desc->integer.value &= (acpi_integer) ACPI_UINT32_MAX;
  233 + obj_desc->integer.value &= (u64) ACPI_UINT32_MAX;
234 234 }
235 235 }
236 236  
237 237  
238 238  
... ... @@ -327,14 +327,14 @@
327 327 *
328 328 ******************************************************************************/
329 329  
330   -static u32 acpi_ex_digits_needed(acpi_integer value, u32 base)
  330 +static u32 acpi_ex_digits_needed(u64 value, u32 base)
331 331 {
332 332 u32 num_digits;
333   - acpi_integer current_value;
  333 + u64 current_value;
334 334  
335 335 ACPI_FUNCTION_TRACE(ex_digits_needed);
336 336  
337   - /* acpi_integer is unsigned, so we don't worry about a '-' prefix */
  337 + /* u64 is unsigned, so we don't worry about a '-' prefix */
338 338  
339 339 if (value == 0) {
340 340 return_UINT32(1);
... ... @@ -370,7 +370,7 @@
370 370 *
371 371 ******************************************************************************/
372 372  
373   -void acpi_ex_eisa_id_to_string(char *out_string, acpi_integer compressed_id)
  373 +void acpi_ex_eisa_id_to_string(char *out_string, u64 compressed_id)
374 374 {
375 375 u32 swapped_id;
376 376  
... ... @@ -394,10 +394,10 @@
394 394 (char)(0x40 + (((unsigned long)swapped_id >> 26) & 0x1F));
395 395 out_string[1] = (char)(0x40 + ((swapped_id >> 21) & 0x1F));
396 396 out_string[2] = (char)(0x40 + ((swapped_id >> 16) & 0x1F));
397   - out_string[3] = acpi_ut_hex_to_ascii_char((acpi_integer)swapped_id, 12);
398   - out_string[4] = acpi_ut_hex_to_ascii_char((acpi_integer)swapped_id, 8);
399   - out_string[5] = acpi_ut_hex_to_ascii_char((acpi_integer)swapped_id, 4);
400   - out_string[6] = acpi_ut_hex_to_ascii_char((acpi_integer)swapped_id, 0);
  397 + out_string[3] = acpi_ut_hex_to_ascii_char((u64) swapped_id, 12);
  398 + out_string[4] = acpi_ut_hex_to_ascii_char((u64) swapped_id, 8);
  399 + out_string[5] = acpi_ut_hex_to_ascii_char((u64) swapped_id, 4);
  400 + out_string[6] = acpi_ut_hex_to_ascii_char((u64) swapped_id, 0);
401 401 out_string[7] = 0;
402 402 }
403 403  
... ... @@ -418,7 +418,7 @@
418 418 *
419 419 ******************************************************************************/
420 420  
421   -void acpi_ex_integer_to_string(char *out_string, acpi_integer value)
  421 +void acpi_ex_integer_to_string(char *out_string, u64 value)
422 422 {
423 423 u32 count;
424 424 u32 digits_needed;
drivers/acpi/acpica/hwtimer.c
Diff comments   View file @ 5df7e6c
... ... @@ -140,7 +140,7 @@
140 140 {
141 141 acpi_status status;
142 142 u32 delta_ticks;
143   - acpi_integer quotient;
  143 + u64 quotient;
144 144  
145 145 ACPI_FUNCTION_TRACE(acpi_get_timer_duration);
146 146  
drivers/acpi/acpica/psargs.c
Diff comments   View file @ 5df7e6c
... ... @@ -403,7 +403,7 @@
403 403 /* Get 1 byte from the AML stream */
404 404  
405 405 opcode = AML_BYTE_OP;
406   - arg->common.value.integer = (acpi_integer) * aml;
  406 + arg->common.value.integer = (u64) *aml;
407 407 length = 1;
408 408 break;
409 409  
drivers/acpi/acpica/rscreate.c
Diff comments   View file @ 5df7e6c
... ... @@ -182,7 +182,7 @@
182 182  
183 183 /*
184 184 * Loop through the ACPI_INTERNAL_OBJECTS - Each object should be a
185   - * package that in turn contains an acpi_integer Address, a u8 Pin,
  185 + * package that in turn contains an u64 Address, a u8 Pin,
186 186 * a Name, and a u8 source_index.
187 187 */
188 188 top_object_list = package_object->package.elements;
drivers/acpi/acpica/utdebug.c
Diff comments   View file @ 5df7e6c
... ... @@ -460,8 +460,7 @@
460 460 void
461 461 acpi_ut_value_exit(u32 line_number,
462 462 const char *function_name,
463   - const char *module_name,
464   - u32 component_id, acpi_integer value)
  463 + const char *module_name, u32 component_id, u64 value)
465 464 {
466 465  
467 466 acpi_debug_print(ACPI_LV_FUNCTIONS,
drivers/acpi/acpica/uteval.c
Diff comments   View file @ 5df7e6c
... ... @@ -348,7 +348,7 @@
348 348 acpi_status
349 349 acpi_ut_evaluate_numeric_object(char *object_name,
350 350 struct acpi_namespace_node *device_node,
351   - acpi_integer *value)
  351 + u64 *value)
352 352 {
353 353 union acpi_operand_object *obj_desc;
354 354 acpi_status status;
drivers/acpi/acpica/utglobal.c
Diff comments   View file @ 5df7e6c
... ... @@ -234,7 +234,7 @@
234 234 *
235 235 ******************************************************************************/
236 236  
237   -char acpi_ut_hex_to_ascii_char(acpi_integer integer, u32 position)
  237 +char acpi_ut_hex_to_ascii_char(u64 integer, u32 position)
238 238 {
239 239  
240 240 return (acpi_gbl_hex_to_ascii[(integer >> position) & 0xF]);
drivers/acpi/acpica/utmath.c
Diff comments   View file @ 5df7e6c
... ... @@ -70,9 +70,8 @@
70 70 *
71 71 ******************************************************************************/
72 72 acpi_status
73   -acpi_ut_short_divide(acpi_integer dividend,
74   - u32 divisor,
75   - acpi_integer * out_quotient, u32 * out_remainder)
  73 +acpi_ut_short_divide(u64 dividend,
  74 + u32 divisor, u64 *out_quotient, u32 *out_remainder)
76 75 {
77 76 union uint64_overlay dividend_ovl;
78 77 union uint64_overlay quotient;
... ... @@ -126,9 +125,8 @@
126 125 ******************************************************************************/
127 126  
128 127 acpi_status
129   -acpi_ut_divide(acpi_integer in_dividend,
130   - acpi_integer in_divisor,
131   - acpi_integer * out_quotient, acpi_integer * out_remainder)
  128 +acpi_ut_divide(u64 in_dividend,
  129 + u64 in_divisor, u64 *out_quotient, u64 *out_remainder)
132 130 {
133 131 union uint64_overlay dividend;
134 132 union uint64_overlay divisor;
... ... @@ -199,9 +197,8 @@
199 197 * The 64-bit remainder must be generated.
200 198 */
201 199 partial1 = quotient.part.lo * divisor.part.hi;
202   - partial2.full =
203   - (acpi_integer) quotient.part.lo * divisor.part.lo;
204   - partial3.full = (acpi_integer) partial2.part.hi + partial1;
  200 + partial2.full = (u64) quotient.part.lo * divisor.part.lo;
  201 + partial3.full = (u64) partial2.part.hi + partial1;
205 202  
206 203 remainder.part.hi = partial3.part.lo;
207 204 remainder.part.lo = partial2.part.lo;
... ... @@ -257,9 +254,8 @@
257 254 *
258 255 ******************************************************************************/
259 256 acpi_status
260   -acpi_ut_short_divide(acpi_integer in_dividend,
261   - u32 divisor,
262   - acpi_integer * out_quotient, u32 * out_remainder)
  257 +acpi_ut_short_divide(u64 in_dividend,
  258 + u32 divisor, u64 *out_quotient, u32 *out_remainder)
263 259 {
264 260  
265 261 ACPI_FUNCTION_TRACE(ut_short_divide);
... ... @@ -284,9 +280,8 @@
284 280 }
285 281  
286 282 acpi_status
287   -acpi_ut_divide(acpi_integer in_dividend,
288   - acpi_integer in_divisor,
289   - acpi_integer * out_quotient, acpi_integer * out_remainder)
  283 +acpi_ut_divide(u64 in_dividend,
  284 + u64 in_divisor, u64 *out_quotient, u64 *out_remainder)
290 285 {
291 286 ACPI_FUNCTION_TRACE(ut_divide);
292 287  
drivers/acpi/acpica/utmisc.c
Diff comments   View file @ 5df7e6c
... ... @@ -724,13 +724,12 @@
724 724 *
725 725 ******************************************************************************/
726 726  
727   -acpi_status
728   -acpi_ut_strtoul64(char *string, u32 base, acpi_integer * ret_integer)
  727 +acpi_status acpi_ut_strtoul64(char *string, u32 base, u64 * ret_integer)
729 728 {
730 729 u32 this_digit = 0;
731   - acpi_integer return_value = 0;
732   - acpi_integer quotient;
733   - acpi_integer dividend;
  730 + u64 return_value = 0;
  731 + u64 quotient;
  732 + u64 dividend;
734 733 u32 to_integer_op = (base == ACPI_ANY_BASE);
735 734 u32 mode32 = (acpi_gbl_integer_byte_width == 4);
736 735 u8 valid_digits = 0;
... ... @@ -844,9 +843,8 @@
844 843  
845 844 /* Divide the digit into the correct position */
846 845  
847   - (void)
848   - acpi_ut_short_divide((dividend - (acpi_integer) this_digit),
849   - base, &quotient, NULL);
  846 + (void)acpi_ut_short_divide((dividend - (u64) this_digit),
  847 + base, &quotient, NULL);
850 848  
851 849 if (return_value > quotient) {
852 850 if (to_integer_op) {
include/acpi/acpiosxf.h
Diff comments   View file @ 5df7e6c
... ... @@ -196,7 +196,7 @@
196 196  
197 197 void acpi_os_wait_events_complete(void *context);
198 198  
199   -void acpi_os_sleep(acpi_integer milliseconds);
  199 +void acpi_os_sleep(u64 milliseconds);
200 200  
201 201 void acpi_os_stall(u32 microseconds);
202 202  
... ... @@ -227,7 +227,7 @@
227 227  
228 228 acpi_status
229 229 acpi_os_write_pci_configuration(struct acpi_pci_id *pci_id,
230   - u32 reg, acpi_integer value, u32 width);
  230 + u32 reg, u64 value, u32 width);
231 231  
232 232 /*
233 233 * Interim function needed for PCI IRQ routing
include/acpi/acrestyp.h
Diff comments   View file @ 5df7e6c
... ... @@ -397,7 +397,7 @@
397 397 struct acpi_pci_routing_table {
398 398 u32 length;
399 399 u32 pin;
400   - acpi_integer address; /* here for 64-bit alignment */
  400 + u64 address; /* here for 64-bit alignment */
401 401 u32 source_index;
402 402 char source[4]; /* pad to 64 bits so sizeof() works in all cases */
403 403 };
include/acpi/actypes.h
Diff comments   View file @ 5df7e6c
... ... @@ -390,14 +390,6 @@
390 390 u32 hi;
391 391 };
392 392  
393   -/*
394   - * Acpi integer width. In ACPI version 1, integers are 32 bits. In ACPI
395   - * version 2, integers are 64 bits. Note that this pertains to the ACPI integer
396   - * type only, not other integers used in the implementation of the ACPI CA
397   - * subsystem.
398   - */
399   -typedef unsigned long long acpi_integer;
400   -#define ACPI_INTEGER_MAX ACPI_UINT64_MAX
401 393 #define ACPI_INTEGER_BIT_SIZE 64
402 394 #define ACPI_MAX_DECIMAL_DIGITS 20 /* 2^64 = 18,446,744,073,709,551,616 */
403 395  
... ... @@ -421,6 +413,19 @@
421 413 #define ACPI_WAIT_FOREVER 0xFFFF /* u16, as per ACPI spec */
422 414 #define ACPI_DO_NOT_WAIT 0
423 415  
  416 +/*
  417 + * Obsolete: Acpi integer width. In ACPI version 1 (1996), integers are 32 bits.
  418 + * In ACPI version 2 (2000) and later, integers are 64 bits. Note that this
  419 + * pertains to the ACPI integer type only, not to other integers used in the
  420 + * implementation of the ACPICA subsystem.
  421 + *
  422 + * 01/2010: This type is obsolete and has been removed from the entire ACPICA
  423 + * code base. It remains here for compatibility with device drivers that use
  424 + * the type. However, it will be removed in the future.
  425 + */
  426 +typedef u64 acpi_integer;
  427 +#define ACPI_INTEGER_MAX ACPI_UINT64_MAX
  428 +
424 429 /*******************************************************************************
425 430 *
426 431 * Commonly used macros
... ... @@ -801,7 +806,7 @@
801 806 acpi_object_type type; /* See definition of acpi_ns_type for values */
802 807 struct {
803 808 acpi_object_type type; /* ACPI_TYPE_INTEGER */
804   - acpi_integer value; /* The actual number */
  809 + u64 value; /* The actual number */
805 810 } integer;
806 811  
807 812 struct {
... ... @@ -945,7 +950,7 @@
945 950 acpi_status(*acpi_adr_space_handler) (u32 function,
946 951 acpi_physical_address address,
947 952 u32 bit_width,
948   - acpi_integer * value,
  953 + u64 *value,
949 954 void *handler_context,
950 955 void *region_context);
951 956  
... ... @@ -1005,7 +1010,7 @@
1005 1010 u8 highest_dstates[4]; /* _sx_d values: 0xFF indicates not valid */
1006 1011 u8 lowest_dstates[5]; /* _sx_w values: 0xFF indicates not valid */
1007 1012 u32 current_status; /* _STA value */
1008   - acpi_integer address; /* _ADR value */
  1013 + u64 address; /* _ADR value */
1009 1014 struct acpica_device_id hardware_id; /* _HID value */
1010 1015 struct acpica_device_id unique_id; /* _UID value */
1011 1016 struct acpica_device_id_list compatible_id_list; /* _CID list <must be last> */