diff --git a/drivers/firmware/rockchip_sip.c b/drivers/firmware/rockchip_sip.c
index afbe394da825..b94967b1e365 100644
--- a/drivers/firmware/rockchip_sip.c
+++ b/drivers/firmware/rockchip_sip.c
@@ -330,7 +330,7 @@ static int fiq_sip_enabled;
 static int fiq_target_cpu;
 static phys_addr_t ft_fiq_mem_phy;
 static void __iomem *ft_fiq_mem_base;
-static void (*sip_fiq_debugger_uart_irq_tf)(struct pt_regs _pt_regs,
+static void (*sip_fiq_debugger_uart_irq_tf)(struct pt_regs *_pt_regs,
 					    unsigned long cpu);
 static struct pt_regs fiq_pt_regs;
 
@@ -426,7 +426,7 @@ static void sip_fiq_debugger_uart_irq_tf_cb(unsigned long sp_el1,
 	if (ft_fiq_mem_base) {
 		cpu_context = (char *)ft_fiq_mem_base + offset;
 		sip_fiq_debugger_get_pt_regs(cpu_context, sp_el1);
-		sip_fiq_debugger_uart_irq_tf(fiq_pt_regs, cpu);
+		sip_fiq_debugger_uart_irq_tf(&fiq_pt_regs, cpu);
 	}
 
 	/* fiq handler done, return to EL3(then EL3 return to EL1 entry) */
diff --git a/drivers/soc/rockchip/rk_fiq_debugger.c b/drivers/soc/rockchip/rk_fiq_debugger.c
index b3408969c103..6aec2c8b7dcf 100644
--- a/drivers/soc/rockchip/rk_fiq_debugger.c
+++ b/drivers/soc/rockchip/rk_fiq_debugger.c
@@ -622,8 +622,6 @@ static inline int fiq_debugger_sdei_enable(struct rk_fiq_debugger *t)
 }
 #endif
 
-static struct pt_regs fiq_pt_regs;
-
 static void rk_fiq_debugger_switch_cpu(struct platform_device *pdev,
 				       unsigned int cpu)
 {
@@ -635,11 +633,9 @@ static void rk_fiq_debugger_enable_debug(struct platform_device *pdev, bool val)
 	sip_fiq_debugger_enable_debug(val);
 }
 
-static void fiq_debugger_uart_irq_tf(struct pt_regs _pt_regs, u64 cpu)
+static void fiq_debugger_uart_irq_tf(struct pt_regs *_pt_regs, u64 cpu)
 {
-	fiq_pt_regs = _pt_regs;
-
-	fiq_debugger_fiq(&fiq_pt_regs, cpu);
+	fiq_debugger_fiq(_pt_regs, cpu);
 }
 
 static int rk_fiq_debugger_uart_dev_resume(struct platform_device *pdev)