Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 392913de authored by Huang Ying's avatar Huang Ying Committed by Len Brown
Browse files

ACPI, APEI, Use apei_exec_run_optional in APEI EINJ and ERST 



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: default avatarHuang Ying <ying.huang@intel.com>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent eecf2f71

drivers/acpi/apei/einj.c

+2 −2
Original line number Diff line number Diff line
@@ -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);
@@ -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;

}

drivers/acpi/apei/erst.c

+6 −6
Original line number Diff line number Diff line
@@ -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);
@@ -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;
@@ -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);
@@ -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;
@@ -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);
@@ -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;