Commit 1d94e1e8 authored by Feng Tang's avatar Feng Tang Committed by Len Brown

ACPICA: GPE support: Remove extraneous parameter from low-level function.

The gpe_register_info argument is no longer needed, reduce it to
make code simpler.
Signed-off-by: default avatarFeng Tang <feng.tang@intel.com>
Signed-off-by: default avatarBob Moore <robert.moore@intel.com>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent 0b232fca
...@@ -110,8 +110,7 @@ acpi_status acpi_hw_write_port(acpi_io_address address, u32 value, u32 width); ...@@ -110,8 +110,7 @@ acpi_status acpi_hw_write_port(acpi_io_address address, u32 value, u32 width);
/* /*
* hwgpe - GPE support * hwgpe - GPE support
*/ */
u32 acpi_hw_get_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);
acpi_status acpi_status
acpi_hw_low_set_gpe(struct acpi_gpe_event_info *gpe_event_info, u32 action); acpi_hw_low_set_gpe(struct acpi_gpe_event_info *gpe_event_info, u32 action);
......
...@@ -80,8 +80,7 @@ acpi_ev_update_gpe_enable_mask(struct acpi_gpe_event_info *gpe_event_info) ...@@ -80,8 +80,7 @@ acpi_ev_update_gpe_enable_mask(struct acpi_gpe_event_info *gpe_event_info)
return_ACPI_STATUS(AE_NOT_EXIST); return_ACPI_STATUS(AE_NOT_EXIST);
} }
register_bit = acpi_hw_get_gpe_register_bit(gpe_event_info, register_bit = acpi_hw_get_gpe_register_bit(gpe_event_info);
gpe_register_info);
/* Clear the run bit up front */ /* Clear the run bit up front */
......
...@@ -357,8 +357,7 @@ acpi_status acpi_set_gpe_wake_mask(acpi_handle gpe_device, u32 gpe_number, u8 ac ...@@ -357,8 +357,7 @@ acpi_status acpi_set_gpe_wake_mask(acpi_handle gpe_device, u32 gpe_number, u8 ac
goto unlock_and_exit; goto unlock_and_exit;
} }
register_bit = register_bit = acpi_hw_get_gpe_register_bit(gpe_event_info);
acpi_hw_get_gpe_register_bit(gpe_event_info, gpe_register_info);
/* Perform the action */ /* Perform the action */
......
...@@ -60,7 +60,6 @@ acpi_hw_enable_wakeup_gpe_block(struct acpi_gpe_xrupt_info *gpe_xrupt_info, ...@@ -60,7 +60,6 @@ acpi_hw_enable_wakeup_gpe_block(struct acpi_gpe_xrupt_info *gpe_xrupt_info,
* FUNCTION: acpi_hw_get_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
* *
* RETURN: Register mask with a one in the GPE bit position * RETURN: Register mask with a one in the GPE bit position
* *
...@@ -69,11 +68,10 @@ acpi_hw_enable_wakeup_gpe_block(struct acpi_gpe_xrupt_info *gpe_xrupt_info, ...@@ -69,11 +68,10 @@ acpi_hw_enable_wakeup_gpe_block(struct acpi_gpe_xrupt_info *gpe_xrupt_info,
* *
******************************************************************************/ ******************************************************************************/
u32 acpi_hw_get_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)
{ {
return (u32)1 << (gpe_event_info->gpe_number - return (u32)1 << (gpe_event_info->gpe_number -
gpe_register_info->base_gpe_number); gpe_event_info->register_info->base_gpe_number);
} }
/****************************************************************************** /******************************************************************************
...@@ -115,8 +113,7 @@ acpi_hw_low_set_gpe(struct acpi_gpe_event_info *gpe_event_info, u32 action) ...@@ -115,8 +113,7 @@ acpi_hw_low_set_gpe(struct acpi_gpe_event_info *gpe_event_info, u32 action)
/* Set or clear just the bit that corresponds to this GPE */ /* Set or clear just the bit that corresponds to this GPE */
register_bit = acpi_hw_get_gpe_register_bit(gpe_event_info, register_bit = acpi_hw_get_gpe_register_bit(gpe_event_info);
gpe_register_info);
switch (action) { switch (action) {
case ACPI_GPE_CONDITIONAL_ENABLE: case ACPI_GPE_CONDITIONAL_ENABLE:
...@@ -178,8 +175,7 @@ acpi_status acpi_hw_clear_gpe(struct acpi_gpe_event_info * gpe_event_info) ...@@ -178,8 +175,7 @@ acpi_status acpi_hw_clear_gpe(struct acpi_gpe_event_info * gpe_event_info)
* Write a one to the appropriate bit in the status register to * Write a one to the appropriate bit in the status register to
* clear this GPE. * clear this GPE.
*/ */
register_bit = register_bit = acpi_hw_get_gpe_register_bit(gpe_event_info);
acpi_hw_get_gpe_register_bit(gpe_event_info, gpe_register_info);
status = acpi_hw_write(register_bit, status = acpi_hw_write(register_bit,
&gpe_register_info->status_address); &gpe_register_info->status_address);
...@@ -222,8 +218,7 @@ acpi_hw_get_gpe_status(struct acpi_gpe_event_info * gpe_event_info, ...@@ -222,8 +218,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_get_gpe_register_bit(gpe_event_info, register_bit = acpi_hw_get_gpe_register_bit(gpe_event_info);
gpe_register_info);
/* GPE currently enabled? (enabled for runtime?) */ /* GPE currently enabled? (enabled for runtime?) */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment