Skip to content

Commit

Permalink
ACPI, APEI, Use apei_exec_run_optional in APEI EINJ and ERST
Browse files Browse the repository at this point in the history 
This patch changes APEI EINJ and ERST to use apei_exec_run for
mandatory actions, and apei_exec_run_optional for optional actions.

Cc: Thomas Renninger <[email protected]>
Signed-off-by: Huang Ying <[email protected]>
Signed-off-by: Len Brown <[email protected]>
  • Loading branch information
@yhuang-intel @lenb
yhuang-intel authored and lenb committed Jul 14, 2011
1 parent eecf2f7 commit 392913d
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
4 changes: 2 additions & 2 deletions drivers/acpi/apei/einj.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -285,7 +285,7 @@ static int __einj_error_inject(u32 type, u64 param1, u64 param2)

einj_exec_ctx_init(&ctx);

rc = apei_exec_run(&ctx, ACPI_EINJ_BEGIN_OPERATION);
rc = apei_exec_run_optional(&ctx, ACPI_EINJ_BEGIN_OPERATION);
if (rc)
return rc;
apei_exec_ctx_set_input(&ctx, type);
Expand Down Expand Up @@ -323,7 +323,7 @@ static int __einj_error_inject(u32 type, u64 param1, u64 param2)
rc = __einj_error_trigger(trigger_paddr);
if (rc)
return rc;
rc = apei_exec_run(&ctx, ACPI_EINJ_END_OPERATION);
rc = apei_exec_run_optional(&ctx, ACPI_EINJ_END_OPERATION);

return rc;
}
Expand Down
12 changes: 6 additions & 6 deletions drivers/acpi/apei/erst.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -642,7 +642,7 @@ static int __erst_write_to_storage(u64 offset)
int rc;

erst_exec_ctx_init(&ctx);
rc = apei_exec_run(&ctx, ACPI_ERST_BEGIN_WRITE);
rc = apei_exec_run_optional(&ctx, ACPI_ERST_BEGIN_WRITE);
if (rc)
return rc;
apei_exec_ctx_set_input(&ctx, offset);
Expand All @@ -666,7 +666,7 @@ static int __erst_write_to_storage(u64 offset)
if (rc)
return rc;
val = apei_exec_ctx_get_output(&ctx);
rc = apei_exec_run(&ctx, ACPI_ERST_END);
rc = apei_exec_run_optional(&ctx, ACPI_ERST_END);
if (rc)
return rc;

Expand All @@ -681,7 +681,7 @@ static int __erst_read_from_storage(u64 record_id, u64 offset)
int rc;

erst_exec_ctx_init(&ctx);
rc = apei_exec_run(&ctx, ACPI_ERST_BEGIN_READ);
rc = apei_exec_run_optional(&ctx, ACPI_ERST_BEGIN_READ);
if (rc)
return rc;
apei_exec_ctx_set_input(&ctx, offset);
Expand Down Expand Up @@ -709,7 +709,7 @@ static int __erst_read_from_storage(u64 record_id, u64 offset)
if (rc)
return rc;
val = apei_exec_ctx_get_output(&ctx);
rc = apei_exec_run(&ctx, ACPI_ERST_END);
rc = apei_exec_run_optional(&ctx, ACPI_ERST_END);
if (rc)
return rc;

Expand All @@ -724,7 +724,7 @@ static int __erst_clear_from_storage(u64 record_id)
int rc;

erst_exec_ctx_init(&ctx);
rc = apei_exec_run(&ctx, ACPI_ERST_BEGIN_CLEAR);
rc = apei_exec_run_optional(&ctx, ACPI_ERST_BEGIN_CLEAR);
if (rc)
return rc;
apei_exec_ctx_set_input(&ctx, record_id);
Expand All @@ -748,7 +748,7 @@ static int __erst_clear_from_storage(u64 record_id)
if (rc)
return rc;
val = apei_exec_ctx_get_output(&ctx);
rc = apei_exec_run(&ctx, ACPI_ERST_END);
rc = apei_exec_run_optional(&ctx, ACPI_ERST_END);
if (rc)
return rc;

Expand Down

0 comments on commit 392913d

Please sign in to comment.