diff options
Diffstat (limited to 'drivers/acpi/acpica/evgpe.c')
-rw-r--r-- | drivers/acpi/acpica/evgpe.c | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/drivers/acpi/acpica/evgpe.c b/drivers/acpi/acpica/evgpe.c index ef0193d74b5d..36d120574423 100644 --- a/drivers/acpi/acpica/evgpe.c +++ b/drivers/acpi/acpica/evgpe.c | |||
@@ -89,7 +89,8 @@ acpi_ev_update_gpe_enable_mask(struct acpi_gpe_event_info *gpe_event_info) | |||
89 | /* Set the mask bit only if there are references to this GPE */ | 89 | /* Set the mask bit only if there are references to this GPE */ |
90 | 90 | ||
91 | if (gpe_event_info->runtime_count) { | 91 | if (gpe_event_info->runtime_count) { |
92 | ACPI_SET_BIT(gpe_register_info->enable_for_run, (u8)register_bit); | 92 | ACPI_SET_BIT(gpe_register_info->enable_for_run, |
93 | (u8)register_bit); | ||
93 | } | 94 | } |
94 | 95 | ||
95 | return_ACPI_STATUS(AE_OK); | 96 | return_ACPI_STATUS(AE_OK); |
@@ -106,8 +107,7 @@ acpi_ev_update_gpe_enable_mask(struct acpi_gpe_event_info *gpe_event_info) | |||
106 | * DESCRIPTION: Clear a GPE of stale events and enable it. | 107 | * DESCRIPTION: Clear a GPE of stale events and enable it. |
107 | * | 108 | * |
108 | ******************************************************************************/ | 109 | ******************************************************************************/ |
109 | acpi_status | 110 | acpi_status acpi_ev_enable_gpe(struct acpi_gpe_event_info *gpe_event_info) |
110 | acpi_ev_enable_gpe(struct acpi_gpe_event_info *gpe_event_info) | ||
111 | { | 111 | { |
112 | acpi_status status; | 112 | acpi_status status; |
113 | 113 | ||
@@ -131,8 +131,8 @@ acpi_ev_enable_gpe(struct acpi_gpe_event_info *gpe_event_info) | |||
131 | } | 131 | } |
132 | 132 | ||
133 | /* Enable the requested GPE */ | 133 | /* Enable the requested GPE */ |
134 | status = acpi_hw_low_set_gpe(gpe_event_info, ACPI_GPE_ENABLE); | ||
135 | 134 | ||
135 | status = acpi_hw_low_set_gpe(gpe_event_info, ACPI_GPE_ENABLE); | ||
136 | return_ACPI_STATUS(status); | 136 | return_ACPI_STATUS(status); |
137 | } | 137 | } |
138 | 138 | ||
@@ -150,7 +150,8 @@ acpi_ev_enable_gpe(struct acpi_gpe_event_info *gpe_event_info) | |||
150 | * | 150 | * |
151 | ******************************************************************************/ | 151 | ******************************************************************************/ |
152 | 152 | ||
153 | acpi_status acpi_ev_add_gpe_reference(struct acpi_gpe_event_info *gpe_event_info) | 153 | acpi_status |
154 | acpi_ev_add_gpe_reference(struct acpi_gpe_event_info *gpe_event_info) | ||
154 | { | 155 | { |
155 | acpi_status status = AE_OK; | 156 | acpi_status status = AE_OK; |
156 | 157 | ||
@@ -191,7 +192,8 @@ acpi_status acpi_ev_add_gpe_reference(struct acpi_gpe_event_info *gpe_event_info | |||
191 | * | 192 | * |
192 | ******************************************************************************/ | 193 | ******************************************************************************/ |
193 | 194 | ||
194 | acpi_status acpi_ev_remove_gpe_reference(struct acpi_gpe_event_info *gpe_event_info) | 195 | acpi_status |
196 | acpi_ev_remove_gpe_reference(struct acpi_gpe_event_info *gpe_event_info) | ||
195 | { | 197 | { |
196 | acpi_status status = AE_OK; | 198 | acpi_status status = AE_OK; |
197 | 199 | ||
@@ -208,7 +210,8 @@ acpi_status acpi_ev_remove_gpe_reference(struct acpi_gpe_event_info *gpe_event_i | |||
208 | 210 | ||
209 | status = acpi_ev_update_gpe_enable_mask(gpe_event_info); | 211 | status = acpi_ev_update_gpe_enable_mask(gpe_event_info); |
210 | if (ACPI_SUCCESS(status)) { | 212 | if (ACPI_SUCCESS(status)) { |
211 | status = acpi_hw_low_set_gpe(gpe_event_info, | 213 | status = |
214 | acpi_hw_low_set_gpe(gpe_event_info, | ||
212 | ACPI_GPE_DISABLE); | 215 | ACPI_GPE_DISABLE); |
213 | } | 216 | } |
214 | 217 | ||
@@ -306,7 +309,8 @@ struct acpi_gpe_event_info *acpi_ev_get_gpe_event_info(acpi_handle gpe_device, | |||
306 | 309 | ||
307 | /* A Non-NULL gpe_device means this is a GPE Block Device */ | 310 | /* A Non-NULL gpe_device means this is a GPE Block Device */ |
308 | 311 | ||
309 | obj_desc = acpi_ns_get_attached_object((struct acpi_namespace_node *) | 312 | obj_desc = |
313 | acpi_ns_get_attached_object((struct acpi_namespace_node *) | ||
310 | gpe_device); | 314 | gpe_device); |
311 | if (!obj_desc || !obj_desc->device.gpe_block) { | 315 | if (!obj_desc || !obj_desc->device.gpe_block) { |
312 | return (NULL); | 316 | return (NULL); |