From: Thorsten Blum <blum@kernel.org>
To: Catalin Marinas <catalin.marinas@arm.com>,
Will Deacon <will@kernel.org>,
Mark Rutland <mark.rutland@arm.com>
Cc: Thorsten Blum <blum@kernel.org>,
linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org
Subject: [PATCH] arm64: cacheinfo: Simplify init_cache_level()
Date: Wed, 4 Nov 2026 09:36:31 +0100 [thread overview]
Message-ID: <20261104083632.65715-2-blum@kernel.org> (raw)
acpi_get_cache_info() already sets fw_level to 0 on failure, so drop the
redundant check and the manual assignment.
Use unsigned int for fw_level to match the expected type, and remove the
now-unused local ret variable.
Signed-off-by: Thorsten Blum <blum@kernel.org>
---
arch/arm64/kernel/cacheinfo.c | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
diff --git a/arch/arm64/kernel/cacheinfo.c b/arch/arm64/kernel/cacheinfo.c
index 309942b06c5b..881131fb4934 100644
--- a/arch/arm64/kernel/cacheinfo.c
+++ b/arch/arm64/kernel/cacheinfo.c
@@ -67,19 +67,15 @@ int early_cache_level(unsigned int cpu)
int init_cache_level(unsigned int cpu)
{
- unsigned int level, leaves;
- int fw_level, ret;
+ unsigned int level, leaves, fw_level;
struct cpu_cacheinfo *this_cpu_ci = get_cpu_cacheinfo(cpu);
detect_cache_level(&level, &leaves);
- if (acpi_disabled) {
+ if (acpi_disabled)
fw_level = of_find_last_cache_level(cpu);
- } else {
- ret = acpi_get_cache_info(cpu, &fw_level, NULL);
- if (ret < 0)
- fw_level = 0;
- }
+ else
+ acpi_get_cache_info(cpu, &fw_level, NULL);
if (level < fw_level) {
/*
next reply other threads:[~2026-11-04 8:37 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-11-04 8:36 Thorsten Blum [this message]
2026-11-04 10:32 ` [PATCH] arm64: cacheinfo: Simplify init_cache_level() Ben Horgan
2026-11-04 11:07 ` Thorsten Blum
2026-11-04 11:19 ` Ben Horgan
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=20261104083632.65715-2-blum@kernel.org \
--to=blum@kernel.org \
--cc=catalin.marinas@arm.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=will@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.