From: Song Shuai Date: Mon, 22 May 2023 02:50:20 +0000 (+0800) Subject: riscv: hibernation: Remove duplicate call of suspend_restore_csrs X-Git-Tag: v6.6.7~2493^2~13 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c6399b893043a5bb634de8677362f96684f1c0c8;p=platform%2Fkernel%2Flinux-starfive.git riscv: hibernation: Remove duplicate call of suspend_restore_csrs The suspend_restore_csrs is called in both __hibernate_cpu_resume and the `else` of subsequent swsusp_arch_suspend. Removing the first call makes both suspend_{save,restore}_csrs left in swsusp_arch_suspend for clean code. Fixes: c0317210012e ("RISC-V: Add arch functions to support hibernation/suspend-to-disk") Reviewed-by: Conor Dooley Reviewed-by: JeeHeng Sia Signed-off-by: Song Shuai Link: https://lore.kernel.org/r/20230522025020.285042-1-songshuaishuai@tinylab.org Signed-off-by: Palmer Dabbelt --- diff --git a/arch/riscv/kernel/hibernate-asm.S b/arch/riscv/kernel/hibernate-asm.S index 5c76671..d698dd7 100644 --- a/arch/riscv/kernel/hibernate-asm.S +++ b/arch/riscv/kernel/hibernate-asm.S @@ -28,7 +28,6 @@ ENTRY(__hibernate_cpu_resume) REG_L a0, hibernate_cpu_context - suspend_restore_csrs suspend_restore_regs /* Return zero value. */