Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f5c1e1c5 authored by Lv Zheng's avatar Lv Zheng Committed by Rafael J. Wysocki
Browse files

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: default avatarLv Zheng <lv.zheng@intel.com>
Signed-off-by: default avatarBob Moore <robert.moore@intel.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 8804f252

drivers/acpi/acpica/acevents.h

+1 −0
Original line number Diff line number Diff line
@@ -72,6 +72,7 @@ acpi_status acpi_ev_init_global_lock_handler(void); 
ACPI_HW_DEPENDENT_RETURN_OK(acpi_status

			    acpi_ev_acquire_global_lock(u16 timeout))

ACPI_HW_DEPENDENT_RETURN_OK(acpi_status acpi_ev_release_global_lock(void))



acpi_status acpi_ev_remove_global_lock_handler(void);



/*

drivers/acpi/acpica/aclocal.h

+17 −14
Original line number Diff line number Diff line
@@ -395,11 +395,12 @@ union acpi_predefined_info { 


/* Return object auto-repair info */



typedef acpi_status(*acpi_object_converter) (struct acpi_namespace_node * scope,

					     union acpi_operand_object

					     *original_object,

					     union acpi_operand_object

					     **converted_object);

typedef acpi_status (*acpi_object_converter) (struct acpi_namespace_node *

					      scope,

					      union acpi_operand_object *

					      original_object,

					      union acpi_operand_object **

					      converted_object);



struct acpi_simple_repair_info {

	char name[ACPI_NAME_SIZE];
@@ -541,8 +542,8 @@ struct acpi_gpe_device_info { 


typedef acpi_status (*acpi_gpe_callback) (struct acpi_gpe_xrupt_info *

					  gpe_xrupt_info,

					 struct acpi_gpe_block_info *gpe_block,

					 void *context);

					  struct acpi_gpe_block_info *

					  gpe_block, void *context);



/* Information about each particular fixed event */
@@ -660,7 +661,8 @@ typedef 
acpi_status (*acpi_parse_downwards) (struct acpi_walk_state * walk_state,

				     union acpi_parse_object ** out_op);



typedef acpi_status(*acpi_parse_upwards) (struct acpi_walk_state * walk_state);

typedef

acpi_status (*acpi_parse_upwards) (struct acpi_walk_state * walk_state);



/* Global handlers for AML Notifies */
@@ -700,7 +702,8 @@ union acpi_generic_state { 
 *

 ****************************************************************************/



typedef acpi_status(*acpi_execute_op) (struct acpi_walk_state * walk_state);

typedef

acpi_status (*acpi_execute_op) (struct acpi_walk_state * walk_state);



/* Address Range info block */

drivers/acpi/acpica/dswload2.c

+2 −2
Original line number Diff line number Diff line
@@ -490,8 +490,8 @@ acpi_status acpi_ds_load2_end_op(struct acpi_walk_state *walk_state) 


			status =

			    acpi_ds_create_index_field(op,

						       (acpi_handle) arg->

						       common.node, walk_state);

						       (acpi_handle)arg->common.

						       node, walk_state);

			break;



		case AML_BANK_FIELD_OP:

drivers/acpi/acpica/evmisc.c

+1 −2
Original line number Diff line number Diff line
@@ -99,8 +99,7 @@ u8 acpi_ev_is_notify_object(struct acpi_namespace_node *node) 
 ******************************************************************************/



acpi_status

acpi_ev_queue_notify_request(struct acpi_namespace_node * node,

			     u32 notify_value)

acpi_ev_queue_notify_request(struct acpi_namespace_node *node, u32 notify_value)

{

	union acpi_operand_object *obj_desc;

	union acpi_operand_object *handler_list_head = NULL;

drivers/acpi/acpica/hwxface.c

+3 −4
Original line number Diff line number Diff line
@@ -91,8 +91,7 @@ acpi_status acpi_reset(void) 
		 * compatibility with other ACPI implementations that have allowed

		 * BIOS code with bad register width values to go unnoticed.

		 */

		status =

		    acpi_os_write_port((acpi_io_address) reset_reg->address,

		status = acpi_os_write_port((acpi_io_address)reset_reg->address,

					    acpi_gbl_FADT.reset_value,

					    ACPI_RESET_REGISTER_WIDTH);

	} else {