git: 8384a19adc88 - main - dtrace/arm64: Simplify variable declarations in the invop handler

The branch main has been updated by markj:

URL: https://cgit.FreeBSD.org/src/commit/?id=8384a19adc88ef31794f5aed1d8c5621b7dff8c9

commit 8384a19adc88ef31794f5aed1d8c5621b7dff8c9
Author:     Mark Johnston <markj@FreeBSD.org>
AuthorDate: 2025-01-22 15:15:18 +0000
Commit:     Mark Johnston <markj@FreeBSD.org>
CommitDate: 2025-01-22 15:26:30 +0000

    dtrace/arm64: Simplify variable declarations in the invop handler
    
    Remove some unused variables and reduce the scope of some others.
    
    No functional change intended.
    
    MFC after:      1 week
    Sponsored by:   Innovate UK
---
 sys/cddl/dev/dtrace/aarch64/dtrace_subr.c | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/sys/cddl/dev/dtrace/aarch64/dtrace_subr.c b/sys/cddl/dev/dtrace/aarch64/dtrace_subr.c
index b4dae1cba539..20418e3a475b 100644
--- a/sys/cddl/dev/dtrace/aarch64/dtrace_subr.c
+++ b/sys/cddl/dev/dtrace/aarch64/dtrace_subr.c
@@ -262,17 +262,15 @@ dtrace_store64(uint64_t *addr, struct trapframe *frame, u_int reg)
 static int
 dtrace_invop_start(struct trapframe *frame)
 {
-	int data, invop, reg, update_sp;
-	register_t arg1, arg2;
-	register_t *sp;
-	int offs;
-	int tmp;
-	int i;
+	int data, invop, tmp;
 
 	invop = dtrace_invop(frame->tf_elr, frame, frame->tf_x[0]);
 
 	tmp = (invop & LDP_STP_MASK);
 	if (tmp == STP_64 || tmp == LDP_64) {
+		register_t arg1, arg2, *sp;
+		int offs;
+
 		sp = (register_t *)frame->tf_sp;
 		data = invop;
 		arg1 = (data >> ARG1_SHIFT) & ARG1_MASK;