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

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

ACPICA: Rename acpi_hw_gpe_register_bit 



Rename acpi_hw_gpe_register_bit to acpi_hw_get_gpe_register_bit
in order to be same with ACPICA code base.

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

drivers/acpi/acpica/achware.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -90,7 +90,7 @@ acpi_status acpi_hw_write_port(acpi_io_address address, u32 value, u32 width); 
/*

/*

 * hwgpe - GPE support

 * hwgpe - GPE support

 */

 */

u32 acpi_hw_gpe_register_bit(struct acpi_gpe_event_info *gpe_event_info,

u32 acpi_hw_get_gpe_register_bit(struct acpi_gpe_event_info *gpe_event_info,

			     struct acpi_gpe_register_info *gpe_register_info);

			     struct acpi_gpe_register_info *gpe_register_info);





acpi_status

acpi_status

drivers/acpi/acpica/evgpe.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -78,7 +78,7 @@ acpi_ev_update_gpe_enable_masks(struct acpi_gpe_event_info *gpe_event_info) 
		return_ACPI_STATUS(AE_NOT_EXIST);

		return_ACPI_STATUS(AE_NOT_EXIST);

	}

	}





	register_bit = acpi_hw_gpe_register_bit(gpe_event_info,

	register_bit = acpi_hw_get_gpe_register_bit(gpe_event_info,

						gpe_register_info);

						gpe_register_info);





	/* Clear the wake/run bits up front */

	/* Clear the wake/run bits up front */

drivers/acpi/acpica/hwgpe.c

+5 −5
Original line number Original line Diff line number Diff line
@@ -57,7 +57,7 @@ acpi_hw_enable_wakeup_gpe_block(struct acpi_gpe_xrupt_info *gpe_xrupt_info, 




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

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

 *

 *

 * FUNCTION:	acpi_hw_gpe_register_bit

 * FUNCTION:	acpi_hw_get_gpe_register_bit

 *

 *

 * PARAMETERS:	gpe_event_info	    - Info block for the GPE

 * PARAMETERS:	gpe_event_info	    - Info block for the GPE

 *		gpe_register_info   - Info block for the GPE register

 *		gpe_register_info   - Info block for the GPE register
@@ -69,7 +69,7 @@ acpi_hw_enable_wakeup_gpe_block(struct acpi_gpe_xrupt_info *gpe_xrupt_info, 
 *

 *

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

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





u32 acpi_hw_gpe_register_bit(struct acpi_gpe_event_info *gpe_event_info,

u32 acpi_hw_get_gpe_register_bit(struct acpi_gpe_event_info *gpe_event_info,

			     struct acpi_gpe_register_info *gpe_register_info)

			     struct acpi_gpe_register_info *gpe_register_info)

{

{

	return (u32)1 << (gpe_event_info->gpe_number -

	return (u32)1 << (gpe_event_info->gpe_number -
@@ -115,7 +115,7 @@ acpi_hw_low_set_gpe(struct acpi_gpe_event_info *gpe_event_info, u8 action) 




	/* Set ot clear just the bit that corresponds to this GPE */

	/* Set ot clear just the bit that corresponds to this GPE */





	register_bit = acpi_hw_gpe_register_bit(gpe_event_info,

	register_bit = acpi_hw_get_gpe_register_bit(gpe_event_info,

						gpe_register_info);

						gpe_register_info);

	switch (action) {

	switch (action) {

	case ACPI_GPE_COND_ENABLE:

	case ACPI_GPE_COND_ENABLE:
@@ -193,7 +193,7 @@ acpi_status acpi_hw_clear_gpe(struct acpi_gpe_event_info * gpe_event_info) 
		return (AE_NOT_EXIST);

		return (AE_NOT_EXIST);

	}

	}





	register_bit = acpi_hw_gpe_register_bit(gpe_event_info,

	register_bit = acpi_hw_get_gpe_register_bit(gpe_event_info,

						gpe_register_info);

						gpe_register_info);





	/*

	/*
@@ -241,7 +241,7 @@ acpi_hw_get_gpe_status(struct acpi_gpe_event_info * gpe_event_info, 




	/* Get the register bitmask for this GPE */

	/* Get the register bitmask for this GPE */





	register_bit = acpi_hw_gpe_register_bit(gpe_event_info,

	register_bit = acpi_hw_get_gpe_register_bit(gpe_event_info,

						gpe_register_info);

						gpe_register_info);





	/* GPE currently enabled? (enabled for runtime?) */

	/* GPE currently enabled? (enabled for runtime?) */