From: LongWei27 <longwei27@huawei.com>
To: Alexander Graf <graf@amazon.com>, Mike Rapoport <rppt@kernel.org>,
Pasha Tatashin <pasha.tatashin@soleen.com>
Cc: Pratyush Yadav <pratyush@kernel.org>, <kexec@lists.infradead.org>,
<linux-mm@kvack.org>, <linux-kernel@vger.kernel.org>,
<hewenliang4@huawei.com>, Long Wei <longwei27@huawei.com>
Subject: [PATCH] kho: Convert error handling to immediate return pattern
Date: Sat, 22 Aug 2026 14:41:27 +0800 [thread overview]
Message-ID: <20260822064127.498411-1-longwei27@huawei.com> (raw)
From: Long Wei <longwei27@huawei.com>
Replace the chained error accumulation (err |= func()) with immediate
per-step error checking and early return in kho_out_fdt_setup().
Signed-off-by: Long Wei <longwei27@huawei.com>
---
kernel/liveupdate/kexec_handover.c | 32 +++++++++++++++++++++---------
1 file changed, 23 insertions(+), 9 deletions(-)
diff --git a/kernel/liveupdate/kexec_handover.c b/kernel/liveupdate/kexec_handover.c
index 175c08a6e..93443ad84 100644
--- a/kernel/liveupdate/kexec_handover.c
+++ b/kernel/liveupdate/kexec_handover.c
@@ -1438,20 +1438,34 @@ static __init int kho_out_fdt_setup(void)
int err;
err = fdt_create(root, PAGE_SIZE);
- err |= fdt_finish_reservemap(root);
- err |= fdt_begin_node(root, "");
- err |= fdt_property_string(root, "compatible", KHO_FDT_COMPATIBLE);
+ if (err)
+ return err;
+ err = fdt_finish_reservemap(root);
+ if (err)
+ return err;
+ err = fdt_begin_node(root, "");
+ if (err)
+ return err;
+ err = fdt_property_string(root, "compatible", KHO_FDT_COMPATIBLE);
+ if (err)
+ return err;
preserved_mem_tree_pa = virt_to_phys(tree->root);
- err |= fdt_property(root, KHO_FDT_MEMORY_MAP_PROP_NAME,
- &preserved_mem_tree_pa,
- sizeof(preserved_mem_tree_pa));
+ err = fdt_property(root, KHO_FDT_MEMORY_MAP_PROP_NAME,
+ &preserved_mem_tree_pa,
+ sizeof(preserved_mem_tree_pa));
+ if (err)
+ return err;
- err |= fdt_end_node(root);
- err |= fdt_finish(root);
+ err = fdt_end_node(root);
+ if (err)
+ return err;
+ err = fdt_finish(root);
+ if (err)
+ return err;
- return err;
+ return 0;
}
static void __init kho_in_kexec_metadata(void)
--
2.43.0
next reply other threads:[~2026-08-22 6:43 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-08-22 6:41 LongWei27 [this message]
2026-08-23 7:39 ` [PATCH] kho: Convert error handling to immediate return pattern Mike Rapoport
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260822064127.498411-1-longwei27@huawei.com \
--to=longwei27@huawei.com \
--cc=graf@amazon.com \
--cc=hewenliang4@huawei.com \
--cc=kexec@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=pasha.tatashin@soleen.com \
--cc=pratyush@kernel.org \
--cc=rppt@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox