ACPI: APEI: Remove unneeded result variables

ye xingchen · rafaeljw · commit 382c5fec89f3 · 2022-09-24T18:50:42.000+02:00
Return the erst_get_record_id_begin() and apei_exec_write_register()
return values directly instead of storing them in redundant local
variables.

Reported-by: Zeal Robot &lt;zealci@zte.com.cn&gt;
Signed-off-by: ye xingchen &lt;ye.xingchen@zte.com.cn&gt;
[ rjw: Changelog edits ]
Signed-off-by: Rafael J. Wysocki &lt;rafael.j.wysocki@intel.com&gt;
diff --git a/drivers/acpi/apei/apei-base.c b/drivers/acpi/apei/apei-base.c
@@ -125,12 +125,9 @@ EXPORT_SYMBOL_GPL(apei_exec_write_register);
 int apei_exec_write_register_value(struct apei_exec_context *ctx,
 				   struct acpi_whea_header *entry)
 {
-	int rc;
-
 	ctx->value = entry->value;
-	rc = apei_exec_write_register(ctx, entry);
 
-	return rc;
+	return apei_exec_write_register(ctx, entry);
 }
 EXPORT_SYMBOL_GPL(apei_exec_write_register_value);
 
diff --git a/drivers/acpi/apei/erst.c b/drivers/acpi/apei/erst.c
@@ -1020,14 +1020,10 @@ static int reader_pos;
 
 static int erst_open_pstore(struct pstore_info *psi)
 {
-	int rc;
-
 	if (erst_disable)
 		return -ENODEV;
 
-	rc = erst_get_record_id_begin(&reader_pos);
-
-	return rc;
+	return erst_get_record_id_begin(&reader_pos);
 }
 
 static int erst_close_pstore(struct pstore_info *psi)

Original file line number	Diff line number	Diff line change
`@@ -125,12 +125,9 @@ EXPORT_SYMBOL_GPL(apei_exec_write_register);`
`125`	`125`	`int apei_exec_write_register_value(struct apei_exec_context *ctx,`
`126`	`126`	`struct acpi_whea_header *entry)`
`127`	`127`	`{`
`128`		`- int rc;`
`129`		`-`
`130`	`128`	`ctx->value = entry->value;`
`131`		`- rc = apei_exec_write_register(ctx, entry);`
`132`	`129`
`133`		`- return rc;`
	`130`	`+ return apei_exec_write_register(ctx, entry);`
`134`	`131`	`}`
`135`	`132`	`EXPORT_SYMBOL_GPL(apei_exec_write_register_value);`
`136`	`133`
Original file line number	Diff line number	Diff line change
`@@ -1020,14 +1020,10 @@ static int reader_pos;`
`1020`	`1020`
`1021`	`1021`	`static int erst_open_pstore(struct pstore_info *psi)`
`1022`	`1022`	`{`
`1023`		`- int rc;`
`1024`		`-`
`1025`	`1023`	`if (erst_disable)`
`1026`	`1024`	`return -ENODEV;`
`1027`	`1025`
`1028`		`- rc = erst_get_record_id_begin(&reader_pos);`
`1029`		`-`
`1030`		`- return rc;`
	`1026`	`+ return erst_get_record_id_begin(&reader_pos);`
`1031`	`1027`	`}`
`1032`	`1028`
`1033`	`1029`	`static int erst_close_pstore(struct pstore_info *psi)`