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

Commit 3a37898d authored by Lin Ming's avatar Lin Ming Committed by Len Brown
Browse files

ACPICA: Rename some function and variable names 



Some function and variable names are renamed to be consistent with
ACPICA code base.

acpi_raw_enable_gpe -> acpi_ev_add_gpe_reference
acpi_raw_disable_gpe -> acpi_ev_remove_gpe_reference
acpi_gpe_can_wake -> acpi_setup_gpe_for_wake
acpi_gpe_wakeup -> acpi_set_gpe_wake_mask
acpi_update_gpes -> acpi_update_all_gpes
acpi_all_gpes_initialized -> acpi_gbl_all_gpes_initialized
acpi_handler_info -> acpi_gpe_handler_info
...

Signed-off-by: default avatarLin Ming <ming.m.lin@intel.com>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent 3cfd53d5

drivers/acpi/acpica/acevents.h

+3 −3
Original line number Diff line number Diff line
@@ -82,9 +82,9 @@ acpi_ev_update_gpe_enable_mask(struct acpi_gpe_event_info *gpe_event_info); 


acpi_status acpi_ev_enable_gpe(struct acpi_gpe_event_info *gpe_event_info);



acpi_status acpi_raw_enable_gpe(struct acpi_gpe_event_info *gpe_event_info);

acpi_status acpi_ev_add_gpe_reference(struct acpi_gpe_event_info *gpe_event_info);



acpi_status acpi_raw_disable_gpe(struct acpi_gpe_event_info *gpe_event_info);

acpi_status acpi_ev_remove_gpe_reference(struct acpi_gpe_event_info *gpe_event_info);



struct acpi_gpe_event_info *acpi_ev_get_gpe_event_info(acpi_handle gpe_device,

						       u32 gpe_number);
@@ -107,7 +107,7 @@ acpi_ev_create_gpe_block(struct acpi_namespace_node *gpe_device, 
acpi_status

acpi_ev_initialize_gpe_block(struct acpi_gpe_xrupt_info *gpe_xrupt_info,

			     struct acpi_gpe_block_info *gpe_block,

			     void *ignored);

			     void *context);



acpi_status acpi_ev_delete_gpe_block(struct acpi_gpe_block_info *gpe_block);

drivers/acpi/acpica/acglobal.h

+1 −1
Original line number Diff line number Diff line
@@ -370,7 +370,7 @@ ACPI_EXTERN struct acpi_fixed_event_handler 
ACPI_EXTERN struct acpi_gpe_xrupt_info *acpi_gbl_gpe_xrupt_list_head;

ACPI_EXTERN struct acpi_gpe_block_info

*acpi_gbl_gpe_fadt_blocks[ACPI_MAX_GPE_BLOCKS];

ACPI_EXTERN u8 acpi_all_gpes_initialized;

ACPI_EXTERN u8 acpi_gbl_all_gpes_initialized;



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

 *

drivers/acpi/acpica/aclocal.h

+4 −4
Original line number Diff line number Diff line
@@ -412,13 +412,13 @@ struct acpi_handler_info { 
	acpi_event_handler address;	/* Address of handler, if any */

	void *context;		/* Context to be passed to handler */

	struct acpi_namespace_node *method_node;	/* Method node for this GPE level (saved) */

	u8 orig_flags;		/* Original misc info about this GPE */

	u8 orig_enabled;	/* Set if the GPE was originally enabled */

	u8 original_flags;      /* Original (pre-handler) GPE info */

	u8 originally_enabled;  /* True if GPE was originally enabled */

};



union acpi_gpe_dispatch_info {

	struct acpi_namespace_node *method_node;	/* Method node for this GPE level */

	struct acpi_handler_info *handler;

	struct acpi_handler_info *handler;  /* Installed GPE handler */

};



/*
@@ -458,7 +458,7 @@ struct acpi_gpe_block_info { 
	u32 register_count;	/* Number of register pairs in block */

	u16 gpe_count;		/* Number of individual GPEs in block */

	u8 block_base_number;	/* Base GPE number for this block */

	u8 initialized;         /* If set, the GPE block has been initialized */

	u8 initialized;         /* TRUE if this block is initialized */

};



/* Information about GPE interrupt handlers, one per each interrupt level used for GPEs */

drivers/acpi/acpica/evgpe.c

+9 −5
Original line number Diff line number Diff line
@@ -137,7 +137,7 @@ acpi_ev_enable_gpe(struct acpi_gpe_event_info *gpe_event_info) 


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

 *

 * FUNCTION:    acpi_raw_enable_gpe

 * FUNCTION:    acpi_ev_add_gpe_reference

 *

 * PARAMETERS:  gpe_event_info  - GPE to enable

 *
@@ -148,10 +148,12 @@ acpi_ev_enable_gpe(struct acpi_gpe_event_info *gpe_event_info) 
 *

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



acpi_status acpi_raw_enable_gpe(struct acpi_gpe_event_info *gpe_event_info)

acpi_status acpi_ev_add_gpe_reference(struct acpi_gpe_event_info *gpe_event_info)

{

	acpi_status status = AE_OK;



	ACPI_FUNCTION_TRACE(ev_add_gpe_reference);



	if (gpe_event_info->runtime_count == ACPI_UINT8_MAX) {

		return_ACPI_STATUS(AE_LIMIT);

	}
@@ -173,7 +175,7 @@ acpi_status acpi_raw_enable_gpe(struct acpi_gpe_event_info *gpe_event_info) 


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

 *

 * FUNCTION:    acpi_raw_disable_gpe

 * FUNCTION:    acpi_ev_remove_gpe_reference

 *

 * PARAMETERS:  gpe_event_info  - GPE to disable

 *
@@ -184,10 +186,12 @@ acpi_status acpi_raw_enable_gpe(struct acpi_gpe_event_info *gpe_event_info) 
 *

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



acpi_status acpi_raw_disable_gpe(struct acpi_gpe_event_info *gpe_event_info)

acpi_status acpi_ev_remove_gpe_reference(struct acpi_gpe_event_info *gpe_event_info)

{

	acpi_status status = AE_OK;



	ACPI_FUNCTION_TRACE(ev_remove_gpe_reference);



	if (!gpe_event_info->runtime_count) {

		return_ACPI_STATUS(AE_LIMIT);

	}
@@ -529,7 +533,7 @@ static void acpi_ev_asynch_enable_gpe(void *context) 
	 * Enable this GPE, conditionally. This means that the GPE will only be

	 * physically enabled if the enable_for_run bit is set in the event_info

	 */

	(void)acpi_hw_low_set_gpe(gpe_event_info, ACPI_GPE_COND_ENABLE);

	(void)acpi_hw_low_set_gpe(gpe_event_info, ACPI_GPE_CONDITIONAL_ENABLE);



	return_VOID;

}

drivers/acpi/acpica/evgpeblk.c

+2 −2
Original line number Diff line number Diff line
@@ -386,7 +386,7 @@ acpi_ev_create_gpe_block(struct acpi_namespace_node *gpe_device, 
		return_ACPI_STATUS(status);

	}



	acpi_all_gpes_initialized = FALSE;

	acpi_gbl_all_gpes_initialized = FALSE;



	/* Find all GPE methods (_Lxx or_Exx) for this block */
@@ -479,7 +479,7 @@ acpi_ev_initialize_gpe_block(struct acpi_gpe_xrupt_info *gpe_xrupt_info, 
				continue;

			}



			status = acpi_raw_enable_gpe(gpe_event_info);

			status = acpi_ev_add_gpe_reference(gpe_event_info);

			if (ACPI_FAILURE(status)) {

				ACPI_EXCEPTION((AE_INFO, status,

					"Could not enable GPE 0x%02X",