[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20241107020831.1561063-6-alistair.francis@wdc.com>
Date: Thu, 7 Nov 2024 12:08:23 +1000
From: Alistair Francis <alistair23@...il.com>
To: alex.gaynor@...il.com,
benno.lossin@...ton.me,
gary@...yguo.net,
linux-kernel@...r.kernel.org,
ojeda@...nel.org,
rust-for-linux@...r.kernel.org,
bjorn3_gh@...tonmail.com,
alistair.francis@....com,
me@...enk.dev,
a.hindborg@...nel.org,
tmgross@...ch.edu,
boqun.feng@...il.com,
aliceryhl@...gle.com
Cc: alistair23@...il.com
Subject: [PATCH 05/13] rust: helpers: Remove kunit helper
Now that we support wrap-static-fns we no longer need the custom helper.
Signed-off-by: Alistair Francis <alistair.francis@....com>
---
rust/bindgen_static_functions | 2 ++
rust/helpers/helpers.c | 1 -
rust/helpers/kunit.c | 9 ---------
3 files changed, 2 insertions(+), 10 deletions(-)
delete mode 100644 rust/helpers/kunit.c
diff --git a/rust/bindgen_static_functions b/rust/bindgen_static_functions
index 0269efa83c618..b4032d277e722 100644
--- a/rust/bindgen_static_functions
+++ b/rust/bindgen_static_functions
@@ -9,3 +9,5 @@
--allowlist-function ERR_PTR
--allowlist-function IS_ERR
--allowlist-function PTR_ERR
+
+--allowlist-function kunit_get_current_test
diff --git a/rust/helpers/helpers.c b/rust/helpers/helpers.c
index 40e51daef412e..875e1fed81c24 100644
--- a/rust/helpers/helpers.c
+++ b/rust/helpers/helpers.c
@@ -9,7 +9,6 @@
#include "bug.c"
#include "build_assert.c"
-#include "kunit.c"
#include "mutex.c"
#include "page.c"
#include "rbtree.c"
diff --git a/rust/helpers/kunit.c b/rust/helpers/kunit.c
deleted file mode 100644
index 9d725067eb3bc..0000000000000
--- a/rust/helpers/kunit.c
+++ /dev/null
@@ -1,9 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-
-#include <kunit/test-bug.h>
-#include <linux/export.h>
-
-struct kunit *rust_helper_kunit_get_current_test(void)
-{
- return kunit_get_current_test();
-}
--
2.47.0
Powered by blists - more mailing lists