lkml.org 
[lkml]   [2011]   [Jul]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 06/17] ACPI, APEI, Use apei_exec_run_optional in APEI EINJ and ERST
    Date
    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 <trenn@novell.com>
    Signed-off-by: Huang Ying <ying.huang@intel.com>
    ---
    drivers/acpi/apei/einj.c | 4 ++--
    drivers/acpi/apei/erst.c | 12 ++++++------
    2 files changed, 8 insertions(+), 8 deletions(-)

    --- a/drivers/acpi/apei/einj.c
    +++ b/drivers/acpi/apei/einj.c
    @@ -307,7 +307,7 @@ static int __einj_error_inject(u32 type,

    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);
    @@ -345,7 +345,7 @@ static int __einj_error_inject(u32 type,
    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;
    }
    --- a/drivers/acpi/apei/erst.c
    +++ b/drivers/acpi/apei/erst.c
    @@ -642,7 +642,7 @@ static int __erst_write_to_storage(u64 o
    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);
    @@ -666,7 +666,7 @@ static int __erst_write_to_storage(u64 o
    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;

    @@ -681,7 +681,7 @@ static int __erst_read_from_storage(u64
    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);
    @@ -709,7 +709,7 @@ static int __erst_read_from_storage(u64
    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;

    @@ -724,7 +724,7 @@ static int __erst_clear_from_storage(u64
    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);
    @@ -748,7 +748,7 @@ static int __erst_clear_from_storage(u64
    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;


    \
     
     \ /
      Last update: 2011-07-13 07:19    [W:0.025 / U:30.648 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site