Skip to content

Commit f5c1e1c

Browse files
Lv Zhengrafaeljw
Lv Zheng
authored and
rafaeljw
committed
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: acpica/acpica@b2294cae Signed-off-by: Lv Zheng <[email protected]> Signed-off-by: Bob Moore <[email protected]> Signed-off-by: Rafael J. Wysocki <[email protected]>
1 parent 8804f25 commit f5c1e1c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

80 files changed

+324
-324
lines changed

‎drivers/acpi/acpica/acdebug.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ ACPI_DBR_DEPENDENT_RETURN_VOID(void
196196
acpi_walk_state
197197
*walk_state))
198198

199-
acpi_status acpi_db_display_all_methods(char *display_count_arg);
199+
acpi_status acpi_db_display_all_methods(char *display_count_arg);
200200

201201
void acpi_db_display_arguments(void);
202202

@@ -220,7 +220,7 @@ ACPI_DBR_DEPENDENT_RETURN_VOID(void
220220
* dbexec - debugger control method execution
221221
*/
222222
void
223-
acpi_db_execute(char *name, char **args, acpi_object_type * types, u32 flags);
223+
acpi_db_execute(char *name, char **args, acpi_object_type *types, u32 flags);
224224

225225
void
226226
acpi_db_create_execution_threads(char *num_threads_arg,
@@ -271,7 +271,7 @@ void ACPI_SYSTEM_XFACE acpi_db_execute_thread(void *context);
271271
acpi_status acpi_db_user_commands(void);
272272

273273
char *acpi_db_get_next_token(char *string,
274-
char **next, acpi_object_type * return_type);
274+
char **next, acpi_object_type *return_type);
275275

276276
/*
277277
* dbobject

‎drivers/acpi/acpica/acevents.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ acpi_status acpi_ev_init_global_lock_handler(void);
7272
ACPI_HW_DEPENDENT_RETURN_OK(acpi_status
7373
acpi_ev_acquire_global_lock(u16 timeout))
7474
ACPI_HW_DEPENDENT_RETURN_OK(acpi_status acpi_ev_release_global_lock(void))
75+
7576
acpi_status acpi_ev_remove_global_lock_handler(void);
7677

7778
/*

‎drivers/acpi/acpica/acinterp.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -370,7 +370,7 @@ acpi_ex_resolve_to_value(union acpi_operand_object **stack_ptr,
370370
acpi_status
371371
acpi_ex_resolve_multiple(struct acpi_walk_state *walk_state,
372372
union acpi_operand_object *operand,
373-
acpi_object_type * return_type,
373+
acpi_object_type *return_type,
374374
union acpi_operand_object **return_desc);
375375

376376
/*

‎drivers/acpi/acpica/aclocal.h

Lines changed: 17 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -278,7 +278,7 @@ struct acpi_create_field_info {
278278
};
279279

280280
typedef
281-
acpi_status(*acpi_internal_method) (struct acpi_walk_state * walk_state);
281+
acpi_status (*acpi_internal_method) (struct acpi_walk_state * walk_state);
282282

283283
/*
284284
* Bitmapped ACPI types. Used internally only
@@ -395,11 +395,12 @@ union acpi_predefined_info {
395395

396396
/* Return object auto-repair info */
397397

398-
typedef acpi_status(*acpi_object_converter) (struct acpi_namespace_node * scope,
399-
union acpi_operand_object
400-
*original_object,
401-
union acpi_operand_object
402-
**converted_object);
398+
typedef acpi_status (*acpi_object_converter) (struct acpi_namespace_node *
399+
scope,
400+
union acpi_operand_object *
401+
original_object,
402+
union acpi_operand_object **
403+
converted_object);
403404

404405
struct acpi_simple_repair_info {
405406
char name[ACPI_NAME_SIZE];
@@ -539,10 +540,10 @@ struct acpi_gpe_device_info {
539540
struct acpi_namespace_node *gpe_device;
540541
};
541542

542-
typedef acpi_status(*acpi_gpe_callback) (struct acpi_gpe_xrupt_info *
543-
gpe_xrupt_info,
544-
struct acpi_gpe_block_info *gpe_block,
545-
void *context);
543+
typedef acpi_status (*acpi_gpe_callback) (struct acpi_gpe_xrupt_info *
544+
gpe_xrupt_info,
545+
struct acpi_gpe_block_info *
546+
gpe_block, void *context);
546547

547548
/* Information about each particular fixed event */
548549

@@ -657,10 +658,11 @@ struct acpi_result_values {
657658
};
658659

659660
typedef
660-
acpi_status(*acpi_parse_downwards) (struct acpi_walk_state * walk_state,
661-
union acpi_parse_object ** out_op);
661+
acpi_status (*acpi_parse_downwards) (struct acpi_walk_state * walk_state,
662+
union acpi_parse_object ** out_op);
662663

663-
typedef acpi_status(*acpi_parse_upwards) (struct acpi_walk_state * walk_state);
664+
typedef
665+
acpi_status (*acpi_parse_upwards) (struct acpi_walk_state * walk_state);
664666

665667
/* Global handlers for AML Notifies */
666668

@@ -700,7 +702,8 @@ union acpi_generic_state {
700702
*
701703
****************************************************************************/
702704

703-
typedef acpi_status(*acpi_execute_op) (struct acpi_walk_state * walk_state);
705+
typedef
706+
acpi_status (*acpi_execute_op) (struct acpi_walk_state * walk_state);
704707

705708
/* Address Range info block */
706709

‎drivers/acpi/acpica/acresrc.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -223,16 +223,16 @@ acpi_rs_get_aei_method_data(struct acpi_namespace_node *node,
223223
* rscalc
224224
*/
225225
acpi_status
226-
acpi_rs_get_list_length(u8 * aml_buffer,
227-
u32 aml_buffer_length, acpi_size * size_needed);
226+
acpi_rs_get_list_length(u8 *aml_buffer,
227+
u32 aml_buffer_length, acpi_size *size_needed);
228228

229229
acpi_status
230230
acpi_rs_get_aml_length(struct acpi_resource *resource_list,
231-
acpi_size resource_list_size, acpi_size * size_needed);
231+
acpi_size resource_list_size, acpi_size *size_needed);
232232

233233
acpi_status
234234
acpi_rs_get_pci_routing_table_length(union acpi_operand_object *package_object,
235-
acpi_size * buffer_size_needed);
235+
acpi_size *buffer_size_needed);
236236

237237
acpi_status
238238
acpi_rs_convert_aml_to_resources(u8 * aml,

‎drivers/acpi/acpica/acutils.h

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -136,16 +136,16 @@ extern const char *acpi_gbl_pt_decode[];
136136
#define ACPI_SMALL_VARIABLE_LENGTH 3
137137

138138
typedef
139-
acpi_status(*acpi_walk_aml_callback) (u8 *aml,
140-
u32 length,
141-
u32 offset,
142-
u8 resource_index, void **context);
139+
acpi_status (*acpi_walk_aml_callback) (u8 *aml,
140+
u32 length,
141+
u32 offset,
142+
u8 resource_index, void **context);
143143

144144
typedef
145-
acpi_status(*acpi_pkg_callback) (u8 object_type,
146-
union acpi_operand_object *source_object,
147-
union acpi_generic_state * state,
148-
void *context);
145+
acpi_status (*acpi_pkg_callback) (u8 object_type,
146+
union acpi_operand_object * source_object,
147+
union acpi_generic_state * state,
148+
void *context);
149149

150150
struct acpi_pkg_info {
151151
u8 *free_space;
@@ -424,7 +424,7 @@ union acpi_operand_object *acpi_ut_create_buffer_object(acpi_size buffer_size);
424424
union acpi_operand_object *acpi_ut_create_string_object(acpi_size string_size);
425425

426426
acpi_status
427-
acpi_ut_get_object_size(union acpi_operand_object *obj, acpi_size * obj_length);
427+
acpi_ut_get_object_size(union acpi_operand_object *obj, acpi_size *obj_length);
428428

429429
/*
430430
* utosi - Support for the _OSI predefined control method
@@ -541,9 +541,9 @@ acpi_ut_display_init_pathname(u8 type,
541541
/*
542542
* utownerid - Support for Table/Method Owner IDs
543543
*/
544-
acpi_status acpi_ut_allocate_owner_id(acpi_owner_id * owner_id);
544+
acpi_status acpi_ut_allocate_owner_id(acpi_owner_id *owner_id);
545545

546-
void acpi_ut_release_owner_id(acpi_owner_id * owner_id);
546+
void acpi_ut_release_owner_id(acpi_owner_id *owner_id);
547547

548548
/*
549549
* utresrc

‎drivers/acpi/acpica/dbcmds.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -738,9 +738,9 @@ acpi_dm_test_resource_conversion(struct acpi_namespace_node *node, char *name)
738738
original_aml = return_buffer.pointer;
739739

740740
acpi_dm_compare_aml_resources(original_aml->buffer.pointer,
741-
(acpi_rsdesc_size) original_aml->buffer.
741+
(acpi_rsdesc_size)original_aml->buffer.
742742
length, new_aml.pointer,
743-
(acpi_rsdesc_size) new_aml.length);
743+
(acpi_rsdesc_size)new_aml.length);
744744

745745
/* Cleanup and exit */
746746

‎drivers/acpi/acpica/dbconvert.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ acpi_db_convert_to_buffer(char *string, union acpi_object *object)
194194
*
195195
******************************************************************************/
196196

197-
acpi_status acpi_db_convert_to_package(char *string, union acpi_object * object)
197+
acpi_status acpi_db_convert_to_package(char *string, union acpi_object *object)
198198
{
199199
char *this;
200200
char *next;
@@ -252,7 +252,7 @@ acpi_status acpi_db_convert_to_package(char *string, union acpi_object * object)
252252

253253
acpi_status
254254
acpi_db_convert_to_object(acpi_object_type type,
255-
char *string, union acpi_object * object)
255+
char *string, union acpi_object *object)
256256
{
257257
acpi_status status = AE_OK;
258258

‎drivers/acpi/acpica/dbexec.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -361,7 +361,7 @@ acpi_db_execution_walk(acpi_handle obj_handle,
361361
******************************************************************************/
362362

363363
void
364-
acpi_db_execute(char *name, char **args, acpi_object_type * types, u32 flags)
364+
acpi_db_execute(char *name, char **args, acpi_object_type *types, u32 flags)
365365
{
366366
acpi_status status;
367367
struct acpi_buffer return_obj;

‎drivers/acpi/acpica/dbinput.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -466,7 +466,7 @@ static void acpi_db_display_help(char *command)
466466
******************************************************************************/
467467

468468
char *acpi_db_get_next_token(char *string,
469-
char **next, acpi_object_type * return_type)
469+
char **next, acpi_object_type *return_type)
470470
{
471471
char *start;
472472
u32 depth;
@@ -684,8 +684,8 @@ static u32 acpi_db_match_command(char *user_command)
684684

685685
acpi_status
686686
acpi_db_command_dispatch(char *input_buffer,
687-
struct acpi_walk_state * walk_state,
688-
union acpi_parse_object * op)
687+
struct acpi_walk_state *walk_state,
688+
union acpi_parse_object *op)
689689
{
690690
u32 temp;
691691
u32 command_index;

‎drivers/acpi/acpica/dbnames.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -285,7 +285,7 @@ void acpi_db_dump_namespace_by_owner(char *owner_arg, char *depth_arg)
285285
u32 max_depth = ACPI_UINT32_MAX;
286286
acpi_owner_id owner_id;
287287

288-
owner_id = (acpi_owner_id) strtoul(owner_arg, NULL, 0);
288+
owner_id = (acpi_owner_id)strtoul(owner_arg, NULL, 0);
289289

290290
/* Now we can check for the depth argument */
291291

‎drivers/acpi/acpica/dbxface.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -162,8 +162,8 @@ void acpi_db_signal_break_point(struct acpi_walk_state *walk_state)
162162
******************************************************************************/
163163

164164
acpi_status
165-
acpi_db_single_step(struct acpi_walk_state * walk_state,
166-
union acpi_parse_object * op, u32 opcode_class)
165+
acpi_db_single_step(struct acpi_walk_state *walk_state,
166+
union acpi_parse_object *op, u32 opcode_class)
167167
{
168168
union acpi_parse_object *next;
169169
acpi_status status = AE_OK;

‎drivers/acpi/acpica/dscontrol.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -163,8 +163,8 @@ acpi_ds_exec_begin_control_op(struct acpi_walk_state *walk_state,
163163
******************************************************************************/
164164

165165
acpi_status
166-
acpi_ds_exec_end_control_op(struct acpi_walk_state * walk_state,
167-
union acpi_parse_object * op)
166+
acpi_ds_exec_end_control_op(struct acpi_walk_state *walk_state,
167+
union acpi_parse_object *op)
168168
{
169169
acpi_status status = AE_OK;
170170
union acpi_generic_state *control_state;

‎drivers/acpi/acpica/dsinit.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ acpi_ds_init_one_object(acpi_handle obj_handle,
188188

189189
acpi_status
190190
acpi_ds_initialize_objects(u32 table_index,
191-
struct acpi_namespace_node * start_node)
191+
struct acpi_namespace_node *start_node)
192192
{
193193
acpi_status status;
194194
struct acpi_init_walk_info info;

‎drivers/acpi/acpica/dsmethod.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ acpi_ds_detect_named_opcodes(struct acpi_walk_state *walk_state,
209209
******************************************************************************/
210210

211211
acpi_status
212-
acpi_ds_method_error(acpi_status status, struct acpi_walk_state * walk_state)
212+
acpi_ds_method_error(acpi_status status, struct acpi_walk_state *walk_state)
213213
{
214214
u32 aml_offset;
215215

‎drivers/acpi/acpica/dsutils.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -569,7 +569,7 @@ acpi_ds_create_operand(struct acpi_walk_state *walk_state,
569569
/* TBD: May only be temporary */
570570

571571
obj_desc =
572-
acpi_ut_create_string_object((acpi_size) name_length);
572+
acpi_ut_create_string_object((acpi_size)name_length);
573573

574574
strncpy(obj_desc->string.pointer,
575575
name_string, name_length);

‎drivers/acpi/acpica/dswload.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -137,8 +137,8 @@ acpi_ds_init_callbacks(struct acpi_walk_state *walk_state, u32 pass_number)
137137
******************************************************************************/
138138

139139
acpi_status
140-
acpi_ds_load1_begin_op(struct acpi_walk_state * walk_state,
141-
union acpi_parse_object ** out_op)
140+
acpi_ds_load1_begin_op(struct acpi_walk_state *walk_state,
141+
union acpi_parse_object **out_op)
142142
{
143143
union acpi_parse_object *op;
144144
struct acpi_namespace_node *node;

‎drivers/acpi/acpica/dswload2.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -490,8 +490,8 @@ acpi_status acpi_ds_load2_end_op(struct acpi_walk_state *walk_state)
490490

491491
status =
492492
acpi_ds_create_index_field(op,
493-
(acpi_handle) arg->
494-
common.node, walk_state);
493+
(acpi_handle)arg->common.
494+
node, walk_state);
495495
break;
496496

497497
case AML_BANK_FIELD_OP:

‎drivers/acpi/acpica/dswstate.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -143,8 +143,8 @@ acpi_ds_result_pop(union acpi_operand_object **object,
143143
******************************************************************************/
144144

145145
acpi_status
146-
acpi_ds_result_push(union acpi_operand_object * object,
147-
struct acpi_walk_state * walk_state)
146+
acpi_ds_result_push(union acpi_operand_object *object,
147+
struct acpi_walk_state *walk_state)
148148
{
149149
union acpi_generic_state *state;
150150
acpi_status status;
@@ -307,7 +307,7 @@ static acpi_status acpi_ds_result_stack_pop(struct acpi_walk_state *walk_state)
307307
******************************************************************************/
308308

309309
acpi_status
310-
acpi_ds_obj_stack_push(void *object, struct acpi_walk_state * walk_state)
310+
acpi_ds_obj_stack_push(void *object, struct acpi_walk_state *walk_state)
311311
{
312312
ACPI_FUNCTION_NAME(ds_obj_stack_push);
313313

@@ -354,7 +354,7 @@ acpi_ds_obj_stack_push(void *object, struct acpi_walk_state * walk_state)
354354
******************************************************************************/
355355

356356
acpi_status
357-
acpi_ds_obj_stack_pop(u32 pop_count, struct acpi_walk_state * walk_state)
357+
acpi_ds_obj_stack_pop(u32 pop_count, struct acpi_walk_state *walk_state)
358358
{
359359
u32 i;
360360

@@ -411,7 +411,7 @@ acpi_ds_obj_stack_pop_and_delete(u32 pop_count,
411411
return;
412412
}
413413

414-
for (i = (s32) pop_count - 1; i >= 0; i--) {
414+
for (i = (s32)pop_count - 1; i >= 0; i--) {
415415
if (walk_state->num_operands == 0) {
416416
return;
417417
}

‎drivers/acpi/acpica/evgpe.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -440,7 +440,7 @@ u32 acpi_ev_gpe_detect(struct acpi_gpe_xrupt_info *gpe_xrupt_list)
440440

441441
gpe_event_info =
442442
&gpe_block->
443-
event_info[((acpi_size) i *
443+
event_info[((acpi_size)i *
444444
ACPI_GPE_REGISTER_WIDTH) + j];
445445
gpe_number =
446446
j + gpe_register_info->base_gpe_number;
@@ -652,7 +652,7 @@ static void ACPI_SYSTEM_XFACE acpi_ev_asynch_enable_gpe(void *context)
652652
*
653653
******************************************************************************/
654654

655-
acpi_status acpi_ev_finish_gpe(struct acpi_gpe_event_info * gpe_event_info)
655+
acpi_status acpi_ev_finish_gpe(struct acpi_gpe_event_info *gpe_event_info)
656656
{
657657
acpi_status status;
658658

‎drivers/acpi/acpica/evgpeblk.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ acpi_ev_create_gpe_info_blocks(struct acpi_gpe_block_info *gpe_block)
211211

212212
/* Allocate the GPE register information block */
213213

214-
gpe_register_info = ACPI_ALLOCATE_ZEROED((acpi_size) gpe_block->
214+
gpe_register_info = ACPI_ALLOCATE_ZEROED((acpi_size)gpe_block->
215215
register_count *
216216
sizeof(struct
217217
acpi_gpe_register_info));
@@ -225,7 +225,7 @@ acpi_ev_create_gpe_info_blocks(struct acpi_gpe_block_info *gpe_block)
225225
* Allocate the GPE event_info block. There are eight distinct GPEs
226226
* per register. Initialization to zeros is sufficient.
227227
*/
228-
gpe_event_info = ACPI_ALLOCATE_ZEROED((acpi_size) gpe_block->gpe_count *
228+
gpe_event_info = ACPI_ALLOCATE_ZEROED((acpi_size)gpe_block->gpe_count *
229229
sizeof(struct
230230
acpi_gpe_event_info));
231231
if (!gpe_event_info) {

0 commit comments

Comments
 (0)