From: Markus Elfring <elfring@xxxxxxxxxxxxxxxxxxxxx>
Date: Mon, 25 Dec 2023 17:18:14 +0100
1. Return directly after a call of the function “kzalloc” failed
at the beginning.
2. Delete the label “err_out” which became unnecessary
with this refactoring.
3. Move an error code assignment into an if branch.
Signed-off-by: Markus Elfring <elfring@xxxxxxxxxxxxxxxxxxxxx>
---
drivers/edac/amd64_edac.c | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/drivers/edac/amd64_edac.c b/drivers/edac/amd64_edac.c
index 49f3d9b54902..64680de47cab 100644
--- a/drivers/edac/amd64_edac.c
+++ b/drivers/edac/amd64_edac.c
@@ -4268,16 +4268,17 @@ static int probe_one_instance(unsigned int nid)
struct ecc_settings *s;
int ret;
- ret = -ENOMEM;
s = kzalloc(sizeof(struct ecc_settings), GFP_KERNEL);
if (!s)
- goto err_out;
+ return -ENOMEM;
ecc_stngs[nid] = s;
pvt = kzalloc(sizeof(struct amd64_pvt), GFP_KERNEL);
- if (!pvt)
+ if (!pvt) {
+ ret = -ENOMEM;
goto err_settings;
+ }
pvt->mc_node_id = nid;
pvt->F3 = F3;
@@ -4336,8 +4337,6 @@ static int probe_one_instance(unsigned int nid)
err_settings:
kfree(s);
ecc_stngs[nid] = NULL;
-
-err_out:
return ret;
}
--
2.43.0
