ACPICA: Divergence: remove unwanted spaces for typedef
ACPICA commit b2294cae776f5a66a7697414b21949d307e6856f This patch removes unwanted spaces for typedef. This solution doesn't cover function types. Note that the linuxize result of this commit is very giant and should have many conflicts against the current Linux upstream. Thus it is required to modify the linuxize result of this commit and the commits around it manually in order to have them merged to the Linux upstream. Since this is very costy, we should do this only once, and if we can't ensure to do this only once, we need to revert the Linux code to the wrong indentation result before merging the linuxize result of this commit. Lv Zheng. Link: https://github.com/acpica/acpica/commit/b2294cae Signed-off-by: Lv Zheng <lv.zheng@intel.com> Signed-off-by: Bob Moore <robert.moore@intel.com> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
This commit is contained in:
Lv Zheng
committed by
Rafael J. Wysocki
Rafael J. Wysocki
parent
8804f2525a
commit
f5c1e1c5a6
@@ -108,7 +108,7 @@ acpi_os_table_override(struct acpi_table_header *existing_table,
|
||||
#ifndef ACPI_USE_ALTERNATE_PROTOTYPE_acpi_os_physical_table_override
|
||||
acpi_status
|
||||
acpi_os_physical_table_override(struct acpi_table_header *existing_table,
|
||||
acpi_physical_address * new_address,
|
||||
acpi_physical_address *new_address,
|
||||
u32 *new_table_length);
|
||||
#endif
|
||||
|
||||
@@ -203,7 +203,7 @@ void acpi_os_unmap_memory(void *logical_address, acpi_size size);
|
||||
#ifndef ACPI_USE_ALTERNATE_PROTOTYPE_acpi_os_get_physical_address
|
||||
acpi_status
|
||||
acpi_os_get_physical_address(void *logical_address,
|
||||
acpi_physical_address * physical_address);
|
||||
acpi_physical_address *physical_address);
|
||||
#endif
|
||||
|
||||
/*
|
||||
@@ -379,14 +379,14 @@ acpi_status
|
||||
acpi_os_get_table_by_name(char *signature,
|
||||
u32 instance,
|
||||
struct acpi_table_header **table,
|
||||
acpi_physical_address * address);
|
||||
acpi_physical_address *address);
|
||||
#endif
|
||||
|
||||
#ifndef ACPI_USE_ALTERNATE_PROTOTYPE_acpi_os_get_table_by_index
|
||||
acpi_status
|
||||
acpi_os_get_table_by_index(u32 index,
|
||||
struct acpi_table_header **table,
|
||||
u32 *instance, acpi_physical_address * address);
|
||||
u32 *instance, acpi_physical_address *address);
|
||||
#endif
|
||||
|
||||
#ifndef ACPI_USE_ALTERNATE_PROTOTYPE_acpi_os_get_table_by_address
|
||||
|
||||
+11
-10
@@ -484,8 +484,8 @@ ACPI_EXTERNAL_RETURN_STATUS(acpi_status __init acpi_load_tables(void))
|
||||
ACPI_EXTERNAL_RETURN_STATUS(acpi_status __init acpi_reallocate_root_table(void))
|
||||
|
||||
ACPI_EXTERNAL_RETURN_STATUS(acpi_status __init
|
||||
acpi_find_root_pointer(acpi_physical_address *
|
||||
rsdp_address))
|
||||
acpi_find_root_pointer(acpi_physical_address
|
||||
*rsdp_address))
|
||||
ACPI_EXTERNAL_RETURN_STATUS(acpi_status
|
||||
acpi_get_table_header(acpi_string signature,
|
||||
u32 instance,
|
||||
@@ -530,7 +530,7 @@ ACPI_EXTERNAL_RETURN_STATUS(acpi_status
|
||||
ACPI_EXTERNAL_RETURN_STATUS(acpi_status
|
||||
acpi_get_handle(acpi_handle parent,
|
||||
acpi_string pathname,
|
||||
acpi_handle * ret_handle))
|
||||
acpi_handle *ret_handle))
|
||||
ACPI_EXTERNAL_RETURN_STATUS(acpi_status
|
||||
acpi_attach_data(acpi_handle object,
|
||||
acpi_object_handler handler,
|
||||
@@ -575,15 +575,15 @@ ACPI_EXTERNAL_RETURN_STATUS(acpi_status
|
||||
acpi_get_next_object(acpi_object_type type,
|
||||
acpi_handle parent,
|
||||
acpi_handle child,
|
||||
acpi_handle * out_handle))
|
||||
acpi_handle *out_handle))
|
||||
|
||||
ACPI_EXTERNAL_RETURN_STATUS(acpi_status
|
||||
acpi_get_type(acpi_handle object,
|
||||
acpi_object_type * out_type))
|
||||
acpi_object_type *out_type))
|
||||
|
||||
ACPI_EXTERNAL_RETURN_STATUS(acpi_status
|
||||
acpi_get_parent(acpi_handle object,
|
||||
acpi_handle * out_handle))
|
||||
acpi_handle *out_handle))
|
||||
|
||||
/*
|
||||
* Handler interfaces
|
||||
@@ -755,7 +755,7 @@ ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status acpi_enable_all_wakeup_gpes(void))
|
||||
|
||||
ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status
|
||||
acpi_get_gpe_device(u32 gpe_index,
|
||||
acpi_handle * gpe_device))
|
||||
acpi_handle *gpe_device))
|
||||
|
||||
ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status
|
||||
acpi_install_gpe_block(acpi_handle gpe_device,
|
||||
@@ -771,8 +771,8 @@ ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status
|
||||
* Resource interfaces
|
||||
*/
|
||||
typedef
|
||||
acpi_status(*acpi_walk_resource_callback) (struct acpi_resource * resource,
|
||||
void *context);
|
||||
acpi_status (*acpi_walk_resource_callback) (struct acpi_resource * resource,
|
||||
void *context);
|
||||
|
||||
ACPI_EXTERNAL_RETURN_STATUS(acpi_status
|
||||
acpi_get_vendor_resource(acpi_handle device,
|
||||
@@ -938,7 +938,8 @@ ACPI_DBG_DEPENDENT_RETURN_VOID(void
|
||||
ACPI_APP_DEPENDENT_RETURN_VOID(ACPI_PRINTF_LIKE(1)
|
||||
void ACPI_INTERNAL_VAR_XFACE
|
||||
acpi_log_error(const char *format, ...))
|
||||
acpi_status acpi_initialize_debugger(void);
|
||||
|
||||
acpi_status acpi_initialize_debugger(void);
|
||||
|
||||
void acpi_terminate_debugger(void);
|
||||
|
||||
|
||||
+21
-20
@@ -893,7 +893,7 @@ typedef u8 acpi_adr_space_type;
|
||||
|
||||
/* Sleep function dispatch */
|
||||
|
||||
typedef acpi_status(*acpi_sleep_function) (u8 sleep_state);
|
||||
typedef acpi_status (*acpi_sleep_function) (u8 sleep_state);
|
||||
|
||||
struct acpi_sleep_functions {
|
||||
acpi_sleep_function legacy_function;
|
||||
@@ -1072,20 +1072,21 @@ void (*acpi_notify_handler) (acpi_handle device, u32 value, void *context);
|
||||
typedef
|
||||
void (*acpi_object_handler) (acpi_handle object, void *data);
|
||||
|
||||
typedef acpi_status(*acpi_init_handler) (acpi_handle object, u32 function);
|
||||
typedef
|
||||
acpi_status (*acpi_init_handler) (acpi_handle object, u32 function);
|
||||
|
||||
#define ACPI_INIT_DEVICE_INI 1
|
||||
|
||||
typedef
|
||||
acpi_status(*acpi_exception_handler) (acpi_status aml_status,
|
||||
acpi_name name,
|
||||
u16 opcode,
|
||||
u32 aml_offset, void *context);
|
||||
acpi_status (*acpi_exception_handler) (acpi_status aml_status,
|
||||
acpi_name name,
|
||||
u16 opcode,
|
||||
u32 aml_offset, void *context);
|
||||
|
||||
/* Table Event handler (Load, load_table, etc.) and types */
|
||||
|
||||
typedef
|
||||
acpi_status(*acpi_table_handler) (u32 event, void *table, void *context);
|
||||
acpi_status (*acpi_table_handler) (u32 event, void *table, void *context);
|
||||
|
||||
#define ACPI_TABLE_LOAD 0x0
|
||||
#define ACPI_TABLE_UNLOAD 0x1
|
||||
@@ -1094,12 +1095,12 @@ acpi_status(*acpi_table_handler) (u32 event, void *table, void *context);
|
||||
/* Address Spaces (For Operation Regions) */
|
||||
|
||||
typedef
|
||||
acpi_status(*acpi_adr_space_handler) (u32 function,
|
||||
acpi_physical_address address,
|
||||
u32 bit_width,
|
||||
u64 *value,
|
||||
void *handler_context,
|
||||
void *region_context);
|
||||
acpi_status (*acpi_adr_space_handler) (u32 function,
|
||||
acpi_physical_address address,
|
||||
u32 bit_width,
|
||||
u64 *value,
|
||||
void *handler_context,
|
||||
void *region_context);
|
||||
|
||||
#define ACPI_DEFAULT_HANDLER NULL
|
||||
|
||||
@@ -1112,18 +1113,18 @@ struct acpi_connection_info {
|
||||
};
|
||||
|
||||
typedef
|
||||
acpi_status(*acpi_adr_space_setup) (acpi_handle region_handle,
|
||||
u32 function,
|
||||
void *handler_context,
|
||||
void **region_context);
|
||||
acpi_status (*acpi_adr_space_setup) (acpi_handle region_handle,
|
||||
u32 function,
|
||||
void *handler_context,
|
||||
void **region_context);
|
||||
|
||||
#define ACPI_REGION_ACTIVATE 0
|
||||
#define ACPI_REGION_DEACTIVATE 1
|
||||
|
||||
typedef
|
||||
acpi_status(*acpi_walk_callback) (acpi_handle object,
|
||||
u32 nesting_level,
|
||||
void *context, void **return_value);
|
||||
acpi_status (*acpi_walk_callback) (acpi_handle object,
|
||||
u32 nesting_level,
|
||||
void *context, void **return_value);
|
||||
|
||||
typedef
|
||||
u32 (*acpi_interface_handler) (acpi_string interface_name, u32 supported);
|
||||
|
||||
Reference in New Issue
Block a user