From: Samuel Holland Date: Wed, 27 Mar 2024 16:04:46 +0000 (-0700) Subject: riscv: Remove extra variable in patch_text_nosync() X-Git-Tag: v6.11-rc1~94^2~11^2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=47742484ee162394d6695e1c9b6894f5b6c226d4;p=thirdparty%2Fkernel%2Flinux.git riscv: Remove extra variable in patch_text_nosync() This cast is superfluous, and is incorrect anyway if compressed instructions may be present. Reviewed-by: Björn Töpel Signed-off-by: Samuel Holland Reviewed-by: Conor Dooley Link: https://lore.kernel.org/r/20240327160520.791322-8-samuel.holland@sifive.com Signed-off-by: Palmer Dabbelt --- diff --git a/arch/riscv/kernel/patch.c b/arch/riscv/kernel/patch.c index 830f0650656be..5b3f6406e8c44 100644 --- a/arch/riscv/kernel/patch.c +++ b/arch/riscv/kernel/patch.c @@ -186,13 +186,11 @@ NOKPROBE_SYMBOL(patch_insn_set); int patch_text_set_nosync(void *addr, u8 c, size_t len) { - u32 *tp = addr; int ret; - ret = patch_insn_set(tp, c, len); - + ret = patch_insn_set(addr, c, len); if (!ret) - flush_icache_range((uintptr_t)tp, (uintptr_t)tp + len); + flush_icache_range((uintptr_t)addr, (uintptr_t)addr + len); return ret; } @@ -224,13 +222,11 @@ NOKPROBE_SYMBOL(patch_insn_write); int patch_text_nosync(void *addr, const void *insns, size_t len) { - u32 *tp = addr; int ret; - ret = patch_insn_write(tp, insns, len); - + ret = patch_insn_write(addr, insns, len); if (!ret) - flush_icache_range((uintptr_t) tp, (uintptr_t) tp + len); + flush_icache_range((uintptr_t)addr, (uintptr_t)addr + len); return ret; }