From: Rafael J. Wysocki <rjw@xxxxxxx>
Subject: ACPI / ACPICA: Reduce code duplication related to GPE lookup
There is some code duplication related to the looking up a GPE in a
GPE block. Namely, the same code construct, which is quite difficult
to read and inefficient, is used in four different places (two times
in acpi_ev_get_gpe_event_info(), in acpi_ev_match_prw_and_gpe()
and in acpi_ev_save_method_info()). To reduce the code duplication
move it to a separate function and clean it up.
Signed-off-by: Rafael J. Wysocki <rjw@xxxxxxx>
---
drivers/acpi/acpica/acevents.h | 4 ++
drivers/acpi/acpica/evgpe.c | 58 ++++++++++++++++++++++++-----------------
drivers/acpi/acpica/evgpeblk.c | 21 ++++----------
3 files changed, 46 insertions(+), 37 deletions(-)
Index: linux-2.6/drivers/acpi/acpica/evgpe.c
===================================================================
--- linux-2.6.orig/drivers/acpi/acpica/evgpe.c
+++ linux-2.6/drivers/acpi/acpica/evgpe.c
@@ -168,6 +168,33 @@ acpi_status acpi_ev_disable_gpe(struct a
return_ACPI_STATUS(status);
}
+
+/*******************************************************************************
+ *
+ * FUNCTION: acpi_ev_gpeblk_event_info
+ *
+ * PARAMETERS: gpe_block - GPE block to search
+ * gpe_number - Raw GPE number
+ *
+ * RETURN: A GPE event_info struct if found. NULL if not found
+ *
+ ******************************************************************************/
+
+struct acpi_gpe_event_info *acpi_ev_gpeblk_event_info(
+ struct acpi_gpe_block_info *gpe_block,
+ u32 gpe_number)
+{
+ u32 gpe_index, gpe_count;
+
+ if (!gpe_block || gpe_number < gpe_block->block_base_number)
+ return (NULL);
+
+ gpe_index = gpe_number - gpe_block->block_base_number;
+ gpe_count = gpe_block->register_count * ACPI_GPE_REGISTER_WIDTH;
+ return gpe_index < gpe_count ?
+ (&gpe_block->event_info[gpe_index]) : (NULL);
+}
+
/*******************************************************************************
*
* FUNCTION: acpi_ev_get_gpe_event_info
@@ -189,7 +216,7 @@ struct acpi_gpe_event_info *acpi_ev_get_
u32 gpe_number)
{
union acpi_operand_object *obj_desc;
- struct acpi_gpe_block_info *gpe_block;
+ struct acpi_gpe_event_info *gpe_info;
u32 i;
ACPI_FUNCTION_ENTRY();
@@ -201,18 +228,11 @@ struct acpi_gpe_event_info *acpi_ev_get_
/* Examine GPE Block 0 and 1 (These blocks are permanent) */
for (i = 0; i < ACPI_MAX_GPE_BLOCKS; i++) {
- gpe_block = acpi_gbl_gpe_fadt_blocks[i];
- if (gpe_block) {
- if ((gpe_number >= gpe_block->block_base_number)
- && (gpe_number <
- gpe_block->block_base_number +
- (gpe_block->register_count * 8))) {
- return (&gpe_block->
- event_info[gpe_number -
- gpe_block->
- block_base_number]);
- }
- }
+ gpe_info = acpi_ev_gpeblk_event_info(
+ acpi_gbl_gpe_fadt_blocks[i],
+ gpe_number);
+ if (gpe_info)
+ return (gpe_info);
}
/* The gpe_number was not in the range of either FADT GPE block */
@@ -228,16 +248,8 @@ struct acpi_gpe_event_info *acpi_ev_get_
return (NULL);
}
- gpe_block = obj_desc->device.gpe_block;
-
- if ((gpe_number >= gpe_block->block_base_number) &&
- (gpe_number <
- gpe_block->block_base_number + (gpe_block->register_count * 8))) {
- return (&gpe_block->
- event_info[gpe_number - gpe_block->block_base_number]);
- }
-
- return (NULL);
+ return acpi_ev_gpeblk_event_info(obj_desc->device.gpe_block,
+ gpe_number);
}
/*******************************************************************************
Index: linux-2.6/drivers/acpi/acpica/acevents.h
===================================================================
--- linux-2.6.orig/drivers/acpi/acpica/acevents.h
+++ linux-2.6/drivers/acpi/acpica/acevents.h
@@ -82,6 +82,10 @@ acpi_status acpi_ev_enable_gpe(struct ac
acpi_status acpi_ev_disable_gpe(struct acpi_gpe_event_info *gpe_event_info);
+struct acpi_gpe_event_info *acpi_ev_gpeblk_event_info(
+ struct acpi_gpe_block_info *gpe_block,
+ u32 gpe_number);
+
struct acpi_gpe_event_info *acpi_ev_get_gpe_event_info(acpi_handle gpe_device,
u32 gpe_number);
Index: linux-2.6/drivers/acpi/acpica/evgpeblk.c
===================================================================
--- linux-2.6.orig/drivers/acpi/acpica/evgpeblk.c
+++ linux-2.6/drivers/acpi/acpica/evgpeblk.c
@@ -311,9 +311,8 @@ acpi_ev_save_method_info(acpi_handle obj
/* Ensure that we have a valid GPE number for this GPE block */
- if ((gpe_number < gpe_block->block_base_number) ||
- (gpe_number >= (gpe_block->block_base_number +
- (gpe_block->register_count * 8)))) {
+ gpe_event_info = acpi_ev_gpeblk_event_info(gpe_block, gpe_number);
+ if (!gpe_event_info) {
/*
* Not valid for this GPE block, just ignore it. However, it may be
* valid for a different GPE block, since GPE0 and GPE1 methods both
@@ -326,8 +325,6 @@ acpi_ev_save_method_info(acpi_handle obj
* Now we can add this information to the gpe_event_info block for use
* during dispatch of this GPE.
*/
- gpe_event_info =
- &gpe_block->event_info[gpe_number - gpe_block->block_base_number];
gpe_event_info->flags = (u8) (type | ACPI_GPE_DISPATCH_METHOD);
@@ -439,15 +436,11 @@ acpi_ev_match_prw_and_gpe(acpi_handle ob
* 2) The GPE index(number) is within the range of the Gpe Block
* associated with the GPE device.
*/
- if ((gpe_device == target_gpe_device) &&
- (gpe_number >= gpe_block->block_base_number) &&
- (gpe_number < gpe_block->block_base_number +
- (gpe_block->register_count * 8))) {
- gpe_event_info = &gpe_block->event_info[gpe_number -
- gpe_block->
- block_base_number];
-
- gpe_event_info->flags |= ACPI_GPE_CAN_WAKE;
+ if (gpe_device == target_gpe_device) {
+ gpe_event_info = acpi_ev_gpeblk_event_info(gpe_block,
+ gpe_number);
+ if (gpe_event_info)
+ gpe_event_info->flags |= ACPI_GPE_CAN_WAKE;
}
cleanup:
--
To unsubscribe from this list: send the line "unsubscribe linux-acpi" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
