Commit 5df7e6cb authored by Bob Moore's avatar Bob Moore Committed by Len Brown
Browse files

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: default avatarBob Moore <robert.moore@intel.com>
Signed-off-by: default avatarLin Ming <ming.m.lin@intel.com>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent 091f4d71

drivers/acpi/acpica/acevents.h

+1 −2
Original line number Diff line number Diff line
@@ -139,8 +139,7 @@ acpi_status acpi_ev_initialize_op_regions(void); 
acpi_status

acpi_ev_address_space_dispatch(union acpi_operand_object *region_obj,

			       u32 function,

			       u32 region_offset,

			       u32 bit_width, acpi_integer * value);

			       u32 region_offset, u32 bit_width, u64 *value);



acpi_status

acpi_ev_attach_region(union acpi_operand_object *handler_obj,

drivers/acpi/acpica/acinterp.h

+19 −23
Original line number Diff line number Diff line
@@ -129,18 +129,17 @@ acpi_ex_common_buffer_setup(union acpi_operand_object *obj_desc, 


acpi_status

acpi_ex_write_with_update_rule(union acpi_operand_object *obj_desc,

			       acpi_integer mask,

			       acpi_integer field_value,

			       u32 field_datum_byte_offset);

			       u64 mask,

			       u64 field_value, u32 field_datum_byte_offset);



void

acpi_ex_get_buffer_datum(acpi_integer * datum,

acpi_ex_get_buffer_datum(u64 *datum,

			 void *buffer,

			 u32 buffer_length,

			 u32 byte_granularity, u32 buffer_offset);



void

acpi_ex_set_buffer_datum(acpi_integer merged_datum,

acpi_ex_set_buffer_datum(u64 merged_datum,

			 void *buffer,

			 u32 buffer_length,

			 u32 byte_granularity, u32 buffer_offset);
@@ -168,8 +167,7 @@ acpi_ex_insert_into_field(union acpi_operand_object *obj_desc, 


acpi_status

acpi_ex_access_region(union acpi_operand_object *obj_desc,

		      u32 field_datum_byte_offset,

		      acpi_integer * value, u32 read_write);

		      u32 field_datum_byte_offset, u64 *value, u32 read_write);



/*

 * exmisc - misc support routines
@@ -193,16 +191,14 @@ acpi_ex_do_concatenate(union acpi_operand_object *obj_desc, 


acpi_status

acpi_ex_do_logical_numeric_op(u16 opcode,

			      acpi_integer integer0,

			      acpi_integer integer1, u8 * logical_result);

			      u64 integer0, u64 integer1, u8 *logical_result);



acpi_status

acpi_ex_do_logical_op(u16 opcode,

		      union acpi_operand_object *operand0,

		      union acpi_operand_object *operand1, u8 *logical_result);



acpi_integer

acpi_ex_do_math_op(u16 opcode, acpi_integer operand0, acpi_integer operand1);

u64 acpi_ex_do_math_op(u16 opcode, u64 operand0, u64 operand1);



acpi_status acpi_ex_create_mutex(struct acpi_walk_state *walk_state);
@@ -278,7 +274,7 @@ acpi_status 
acpi_ex_system_do_notify_op(union acpi_operand_object *value,

			    union acpi_operand_object *obj_desc);



acpi_status acpi_ex_system_do_suspend(acpi_integer time);

acpi_status acpi_ex_system_do_suspend(u64 time);



acpi_status acpi_ex_system_do_stall(u32 time);
@@ -461,9 +457,9 @@ void acpi_ex_acquire_global_lock(u32 rule); 


void acpi_ex_release_global_lock(u32 rule);



void acpi_ex_eisa_id_to_string(char *dest, acpi_integer compressed_id);

void acpi_ex_eisa_id_to_string(char *dest, u64 compressed_id);



void acpi_ex_integer_to_string(char *dest, acpi_integer value);

void acpi_ex_integer_to_string(char *dest, u64 value);



/*

 * exregion - default op_region handlers
@@ -472,7 +468,7 @@ acpi_status 
acpi_ex_system_memory_space_handler(u32 function,

				    acpi_physical_address address,

				    u32 bit_width,

				    acpi_integer * value,

				    u64 *value,

				    void *handler_context,

				    void *region_context);
@@ -480,35 +476,35 @@ acpi_status 
acpi_ex_system_io_space_handler(u32 function,

				acpi_physical_address address,

				u32 bit_width,

				acpi_integer * value,

				u64 *value,

				void *handler_context, void *region_context);



acpi_status

acpi_ex_pci_config_space_handler(u32 function,

				 acpi_physical_address address,

				 u32 bit_width,

				 acpi_integer * value,

				 u64 *value,

				 void *handler_context, void *region_context);



acpi_status

acpi_ex_cmos_space_handler(u32 function,

			   acpi_physical_address address,

			   u32 bit_width,

			   acpi_integer * value,

			   u64 *value,

			   void *handler_context, void *region_context);



acpi_status

acpi_ex_pci_bar_space_handler(u32 function,

			      acpi_physical_address address,

			      u32 bit_width,

			      acpi_integer * value,

			      u64 *value,

			      void *handler_context, void *region_context);



acpi_status

acpi_ex_embedded_controller_space_handler(u32 function,

					  acpi_physical_address address,

					  u32 bit_width,

					  acpi_integer * value,

					  u64 *value,

					  void *handler_context,

					  void *region_context);
@@ -516,14 +512,14 @@ acpi_status 
acpi_ex_sm_bus_space_handler(u32 function,

			     acpi_physical_address address,

			     u32 bit_width,

			     acpi_integer * value,

			     u64 *value,

			     void *handler_context, void *region_context);



acpi_status

acpi_ex_data_table_space_handler(u32 function,

				 acpi_physical_address address,

				 u32 bit_width,

				 acpi_integer * value,

				 u64 *value,

				 void *handler_context, void *region_context);



#endif				/* __INTERP_H__ */

drivers/acpi/acpica/aclocal.h

+1 −1
Original line number Diff line number Diff line
@@ -650,7 +650,7 @@ struct acpi_opcode_info { 
};



union acpi_parse_value {

	acpi_integer integer;	/* Integer constant (Up to 64 bits) */

	u64 integer;		/* Integer constant (Up to 64 bits) */

	struct uint64_struct integer64;	/* Structure overlay for 2 32-bit Dwords */

	u32 size;		/* bytelist or field size */

	char *string;		/* NULL terminated string */

drivers/acpi/acpica/acmacros.h

+6 −6
Original line number Diff line number Diff line
@@ -272,8 +272,8 @@ 
 * MASK_BITS_ABOVE creates a mask starting AT the position and above

 * MASK_BITS_BELOW creates a mask starting one bit BELOW the position

 */

#define ACPI_MASK_BITS_ABOVE(position)      (~((ACPI_INTEGER_MAX) << ((u32) (position))))

#define ACPI_MASK_BITS_BELOW(position)      ((ACPI_INTEGER_MAX) << ((u32) (position)))

#define ACPI_MASK_BITS_ABOVE(position)      (~((ACPI_UINT64_MAX) << ((u32) (position))))

#define ACPI_MASK_BITS_BELOW(position)      ((ACPI_UINT64_MAX) << ((u32) (position)))



/* Bitfields within ACPI registers */
@@ -414,16 +414,16 @@ 
											acpi_ut_ptr_exit (ACPI_DEBUG_PARAMETERS, (u8 *) _s); \

											return (_s); })

#define return_VALUE(s)                 ACPI_DO_WHILE0 ({ \

											register acpi_integer _s = (s); \

											register u64 _s = (s); \

											acpi_ut_value_exit (ACPI_DEBUG_PARAMETERS, _s); \

											return (_s); })

#define return_UINT8(s)                 ACPI_DO_WHILE0 ({ \

											register u8 _s = (u8) (s); \

											acpi_ut_value_exit (ACPI_DEBUG_PARAMETERS, (acpi_integer) _s); \

											acpi_ut_value_exit (ACPI_DEBUG_PARAMETERS, (u64) _s); \

											return (_s); })

#define return_UINT32(s)                ACPI_DO_WHILE0 ({ \

											register u32 _s = (u32) (s); \

											acpi_ut_value_exit (ACPI_DEBUG_PARAMETERS, (acpi_integer) _s); \

											acpi_ut_value_exit (ACPI_DEBUG_PARAMETERS, (u64) _s); \

											return (_s); })

#else				/* Use original less-safe macros */
@@ -434,7 +434,7 @@ 
											acpi_ut_ptr_exit (ACPI_DEBUG_PARAMETERS, (u8 *) (s)); \

											return((s)); })

#define return_VALUE(s)                 ACPI_DO_WHILE0 ({ \

											acpi_ut_value_exit (ACPI_DEBUG_PARAMETERS, (acpi_integer) (s)); \

											acpi_ut_value_exit (ACPI_DEBUG_PARAMETERS, (u64) (s)); \

											return((s)); })

#define return_UINT8(s)                 return_VALUE(s)

#define return_UINT32(s)                return_VALUE(s)

drivers/acpi/acpica/acobject.h

+1 −1
Original line number Diff line number Diff line
@@ -111,7 +111,7 @@ ACPI_OBJECT_COMMON_HEADER}; 


struct acpi_object_integer {

	ACPI_OBJECT_COMMON_HEADER u8 fill[3];	/* Prevent warning on some compilers */

	acpi_integer value;

	u64 value;

};



/*

CRA Git | Maintained and supported by SUSTech CRA and CCSE