diff options
| -rw-r--r-- | drivers/acpi/acpica/achware.h | 2 | ||||
| -rw-r--r-- | drivers/acpi/acpica/evgpe.c | 2 | ||||
| -rw-r--r-- | drivers/acpi/acpica/hwgpe.c | 10 |
3 files changed, 7 insertions, 7 deletions
diff --git a/drivers/acpi/acpica/achware.h b/drivers/acpi/acpica/achware.h index 32391588e163..c73144c9a395 100644 --- a/drivers/acpi/acpica/achware.h +++ b/drivers/acpi/acpica/achware.h | |||
| @@ -90,7 +90,7 @@ acpi_status acpi_hw_write_port(acpi_io_address address, u32 value, u32 width); | |||
| 90 | /* | 90 | /* |
| 91 | * hwgpe - GPE support | 91 | * hwgpe - GPE support |
| 92 | */ | 92 | */ |
| 93 | u32 acpi_hw_gpe_register_bit(struct acpi_gpe_event_info *gpe_event_info, | 93 | u32 acpi_hw_get_gpe_register_bit(struct acpi_gpe_event_info *gpe_event_info, |
| 94 | struct acpi_gpe_register_info *gpe_register_info); | 94 | struct acpi_gpe_register_info *gpe_register_info); |
| 95 | 95 | ||
| 96 | acpi_status | 96 | acpi_status |
diff --git a/drivers/acpi/acpica/evgpe.c b/drivers/acpi/acpica/evgpe.c index 7c2c336006a1..d24d7d31f40c 100644 --- a/drivers/acpi/acpica/evgpe.c +++ b/drivers/acpi/acpica/evgpe.c | |||
| @@ -78,7 +78,7 @@ acpi_ev_update_gpe_enable_masks(struct acpi_gpe_event_info *gpe_event_info) | |||
| 78 | return_ACPI_STATUS(AE_NOT_EXIST); | 78 | return_ACPI_STATUS(AE_NOT_EXIST); |
| 79 | } | 79 | } |
| 80 | 80 | ||
| 81 | register_bit = acpi_hw_gpe_register_bit(gpe_event_info, | 81 | register_bit = acpi_hw_get_gpe_register_bit(gpe_event_info, |
| 82 | gpe_register_info); | 82 | gpe_register_info); |
| 83 | 83 | ||
| 84 | /* Clear the wake/run bits up front */ | 84 | /* Clear the wake/run bits up front */ |
diff --git a/drivers/acpi/acpica/hwgpe.c b/drivers/acpi/acpica/hwgpe.c index 3450309c2786..12d70fdadc2b 100644 --- a/drivers/acpi/acpica/hwgpe.c +++ b/drivers/acpi/acpica/hwgpe.c | |||
| @@ -57,7 +57,7 @@ acpi_hw_enable_wakeup_gpe_block(struct acpi_gpe_xrupt_info *gpe_xrupt_info, | |||
| 57 | 57 | ||
| 58 | /****************************************************************************** | 58 | /****************************************************************************** |
| 59 | * | 59 | * |
| 60 | * FUNCTION: acpi_hw_gpe_register_bit | 60 | * FUNCTION: acpi_hw_get_gpe_register_bit |
| 61 | * | 61 | * |
| 62 | * PARAMETERS: gpe_event_info - Info block for the GPE | 62 | * PARAMETERS: gpe_event_info - Info block for the GPE |
| 63 | * gpe_register_info - Info block for the GPE register | 63 | * 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, | |||
| 69 | * | 69 | * |
| 70 | ******************************************************************************/ | 70 | ******************************************************************************/ |
| 71 | 71 | ||
| 72 | u32 acpi_hw_gpe_register_bit(struct acpi_gpe_event_info *gpe_event_info, | 72 | u32 acpi_hw_get_gpe_register_bit(struct acpi_gpe_event_info *gpe_event_info, |
| 73 | struct acpi_gpe_register_info *gpe_register_info) | 73 | struct acpi_gpe_register_info *gpe_register_info) |
| 74 | { | 74 | { |
| 75 | return (u32)1 << (gpe_event_info->gpe_number - | 75 | 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) | |||
| 115 | 115 | ||
| 116 | /* Set ot clear just the bit that corresponds to this GPE */ | 116 | /* Set ot clear just the bit that corresponds to this GPE */ |
| 117 | 117 | ||
| 118 | register_bit = acpi_hw_gpe_register_bit(gpe_event_info, | 118 | register_bit = acpi_hw_get_gpe_register_bit(gpe_event_info, |
| 119 | gpe_register_info); | 119 | gpe_register_info); |
| 120 | switch (action) { | 120 | switch (action) { |
| 121 | case ACPI_GPE_COND_ENABLE: | 121 | case ACPI_GPE_COND_ENABLE: |
| @@ -193,7 +193,7 @@ acpi_status acpi_hw_clear_gpe(struct acpi_gpe_event_info * gpe_event_info) | |||
| 193 | return (AE_NOT_EXIST); | 193 | return (AE_NOT_EXIST); |
| 194 | } | 194 | } |
| 195 | 195 | ||
| 196 | register_bit = acpi_hw_gpe_register_bit(gpe_event_info, | 196 | register_bit = acpi_hw_get_gpe_register_bit(gpe_event_info, |
| 197 | gpe_register_info); | 197 | gpe_register_info); |
| 198 | 198 | ||
| 199 | /* | 199 | /* |
| @@ -241,7 +241,7 @@ acpi_hw_get_gpe_status(struct acpi_gpe_event_info * gpe_event_info, | |||
| 241 | 241 | ||
| 242 | /* Get the register bitmask for this GPE */ | 242 | /* Get the register bitmask for this GPE */ |
| 243 | 243 | ||
| 244 | register_bit = acpi_hw_gpe_register_bit(gpe_event_info, | 244 | register_bit = acpi_hw_get_gpe_register_bit(gpe_event_info, |
| 245 | gpe_register_info); | 245 | gpe_register_info); |
| 246 | 246 | ||
| 247 | /* GPE currently enabled? (enabled for runtime?) */ | 247 | /* GPE currently enabled? (enabled for runtime?) */ |
