Some small cleanups.

Signed-off-by: Geliang Tang <geliang.tang@suse.com>
---
 tools/testing/selftests/bpf/bpf_tcp_helpers.h  | 2 +-
 tools/testing/selftests/bpf/prog_tests/mptcp.c | 2 +-
 tools/testing/selftests/bpf/progs/mptcp.c      | 9 ++++++---
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/tools/testing/selftests/bpf/bpf_tcp_helpers.h b/tools/testing/selftests/bpf/bpf_tcp_helpers.h
index 05f62f81cc4d..9ea6687c8f4d 100644
--- a/tools/testing/selftests/bpf/bpf_tcp_helpers.h
+++ b/tools/testing/selftests/bpf/bpf_tcp_helpers.h
@@ -86,7 +86,7 @@ struct tcp_sock {
 struct mptcp_sock {
 	struct inet_connection_sock	sk;
 
-	__u32	token;
+	__u32		token;
 } __attribute__((preserve_access_index));
 
 static __always_inline struct inet_connection_sock *inet_csk(const struct sock *sk)
diff --git a/tools/testing/selftests/bpf/prog_tests/mptcp.c b/tools/testing/selftests/bpf/prog_tests/mptcp.c
index 035a87755b94..80ae5a9777bf 100644
--- a/tools/testing/selftests/bpf/prog_tests/mptcp.c
+++ b/tools/testing/selftests/bpf/prog_tests/mptcp.c
@@ -56,7 +56,7 @@ static __u32 get_msk_token(void)
 	fd = open(monitor_log_path, O_RDONLY);
 	if (CHECK_FAIL(fd < 0)) {
 		log_err("Failed to open %s", monitor_log_path);
-		goto err;
+		return token;
 	}
 
 	len = read(fd, buf, sizeof(buf));
diff --git a/tools/testing/selftests/bpf/progs/mptcp.c b/tools/testing/selftests/bpf/progs/mptcp.c
index b08448a12c02..928111f56f69 100644
--- a/tools/testing/selftests/bpf/progs/mptcp.c
+++ b/tools/testing/selftests/bpf/progs/mptcp.c
@@ -22,7 +22,8 @@ struct {
 SEC("sockops")
 int _sockops(struct bpf_sock_ops *ctx)
 {
-	char fmt[] = "invoked=%u is_mptcp=%u token=%x";
+	char fmt1[] = "invoked=%u is_mptcp=%u";
+	char fmt2[] = "token=%x";
 	struct mptcp_storage *storage;
 	struct bpf_tcp_sock *tcp_sk;
 	struct mptcp_sock *msk;
@@ -61,8 +62,10 @@ int _sockops(struct bpf_sock_ops *ctx)
 	}
 	storage->invoked++;
 	storage->is_mptcp = tcp_sk->is_mptcp;
-	bpf_trace_printk(fmt, sizeof(fmt),
-			 storage->invoked, storage->is_mptcp, storage->token);
+	bpf_trace_printk(fmt1, sizeof(fmt1),
+			 storage->invoked, storage->is_mptcp);
+	bpf_trace_printk(fmt2, sizeof(fmt2),
+			 storage->token);
 
 	return 1;
 }
-- 
2.34.1