Commit dbe9aa30 authored by Jay Lu's avatar Jay Lu Committed by Wen Jin
Browse files

ACPI: APEI: EINJ: Fix formatting errors 

mainline inclusion
from mainline-v6.2-rc1
commit 37ea9693
category: feature
bugzilla: https://gitee.com/openeuler/intel-kernel/issues/I8ZRE0
CVE: NA

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=37ea9693869627df5b15cbd4d67237e17f806be4



--------------------------------

Checkpatch reveals warnings and an error due to missing lines and
incorrect indentations. Add the missing lines after declarations and
fix the suspect indentations.

Intel-SIG: commit 37ea9693 ACPI: APEI: EINJ: Fix formatting errors.
Backport to fix indentations issue.

Signed-off-by: default avatarJay Lu <jaylu102@amd.com>
Signed-off-by: default avatarBen Cheatham <benjamin.cheatham@amd.com>
Reviewed-by: default avatarTony Luck <tony.luck@intel.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
Signed-off-by: default avatarWen Jin <wen.jin@intel.com>
parent 6ccb1cea

drivers/acpi/apei/einj.c

+8 −7
Original line number Diff line number Diff line
@@ -357,6 +357,7 @@ static int __einj_error_trigger(u64 trigger_paddr, u32 type, 
	 */

	if ((param_extension || acpi5) && (type & MEM_ERROR_MASK) && param2) {

		struct apei_resources addr_resources;



		apei_resources_init(&addr_resources);

		trigger_param_region = einj_get_trigger_parameter_region(

			trigger_tab, param1, param2);
@@ -465,6 +466,7 @@ static int __einj_error_inject(u32 type, u32 flags, u64 param1, u64 param2, 
			return rc;

		if (einj_param) {

			struct einj_parameter *v4param = einj_param;



			v4param->param1 = param1;

			v4param->param2 = param2;

		}
@@ -688,8 +690,7 @@ static int __init einj_init(void) 
	if (status == AE_NOT_FOUND) {

		pr_warn("EINJ table not found.\n");

		return -ENODEV;

	}

	else if (ACPI_FAILURE(status)) {

	} else if (ACPI_FAILURE(status)) {

		pr_err("Failed to get EINJ table: %s\n",

				acpi_format_exception(status));

		return -EINVAL;