From: Alistair Francis <alistair@alistair23.me>
To: linux-kernel@vger.kernel.org, boqun.feng@gmail.com,
a.hindborg@kernel.org, me@kloenk.dev, benno.lossin@proton.me,
tmgross@umich.edu, aliceryhl@google.com, gary@garyguo.net,
ojeda@kernel.org, rust-for-linux@vger.kernel.org,
alex.gaynor@gmail.com, alistair.francis@wdc.com,
bjorn3_gh@protonmail.com
Cc: alistair23@gmail.com, Alistair Francis <alistair@alistair23.me>
Subject: [PATCH v3 04/11] rust: helpers: Remove kunit helper
Date: Mon, 11 Nov 2024 21:26:08 +1000 [thread overview]
Message-ID: <20241111112615.179133-5-alistair@alistair23.me> (raw)
In-Reply-To: <20241111112615.179133-1-alistair@alistair23.me>
Now that we support wrap-static-fns we no longer need the custom helper.
Signed-off-by: Alistair Francis <alistair@alistair23.me>
---
rust/bindgen_static_functions | 2 ++
rust/bindings/bindings_helper.h | 1 +
rust/helpers/helpers.c | 1 -
rust/helpers/kunit.c | 8 --------
4 files changed, 3 insertions(+), 9 deletions(-)
delete mode 100644 rust/helpers/kunit.c
diff --git a/rust/bindgen_static_functions b/rust/bindgen_static_functions
index 0269efa83c61..b4032d277e72 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/bindings/bindings_helper.h b/rust/bindings/bindings_helper.h
index a80783fcbe04..00b1c1c3ab76 100644
--- a/rust/bindings/bindings_helper.h
+++ b/rust/bindings/bindings_helper.h
@@ -14,6 +14,7 @@
#include <linux/ethtool.h>
#include <linux/firmware.h>
#include <linux/jiffies.h>
+#include <kunit/test-bug.h>
#include <linux/mdio.h>
#include <linux/phy.h>
#include <linux/refcount.h>
diff --git a/rust/helpers/helpers.c b/rust/helpers/helpers.c
index e089ecdf091f..60b3fdc5c2de 100644
--- a/rust/helpers/helpers.c
+++ b/rust/helpers/helpers.c
@@ -10,7 +10,6 @@
#include "bug.c"
#include "build_assert.c"
#include "build_bug.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 b85a4d394c11..000000000000
--- a/rust/helpers/kunit.c
+++ /dev/null
@@ -1,8 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-
-#include <kunit/test-bug.h>
-
-struct kunit *rust_helper_kunit_get_current_test(void)
-{
- return kunit_get_current_test();
-}
--
2.47.0
next prev parent reply other threads:[~2024-11-11 11:26 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-11-11 11:26 [PATCH v3 00/11] rust: bindings: Auto-generate inline static functions Alistair Francis
2024-11-11 11:26 ` [PATCH v3 01/11] rust: bindings: Support some " Alistair Francis
2024-11-11 11:46 ` Andreas Hindborg
2024-11-11 22:51 ` Alistair Francis
2024-11-11 12:07 ` Andreas Hindborg
2024-11-11 22:58 ` Alistair Francis
2024-11-12 9:58 ` Andreas Hindborg
2024-11-12 23:18 ` Alistair Francis
2024-11-11 11:26 ` [PATCH v3 02/11] rust: helpers: Remove blk helper Alistair Francis
2024-11-11 11:26 ` [PATCH v3 03/11] rust: helpers: Remove err helper Alistair Francis
2024-11-11 11:26 ` Alistair Francis [this message]
2024-11-11 11:26 ` [PATCH v3 05/11] rust: helpers: Remove some page helpers Alistair Francis
2024-11-11 11:26 ` [PATCH v3 06/11] rust: helpers: Remove rbtree helper Alistair Francis
2024-11-11 11:26 ` [PATCH v3 07/11] rust: helpers: Remove some refcount helpers Alistair Francis
2024-11-11 11:26 ` [PATCH v3 08/11] rust: helpers: Remove signal helper Alistair Francis
2024-11-11 11:26 ` [PATCH v3 09/11] rust: helpers: Remove some spinlock helpers Alistair Francis
2024-11-11 11:26 ` [PATCH v3 10/11] rust: helpers: Remove some task helpers Alistair Francis
2024-11-11 11:26 ` [PATCH v3 11/11] rust: helpers: Remove uaccess helpers Alistair Francis
2024-11-11 13:23 ` [PATCH v3 00/11] rust: bindings: Auto-generate inline static functions Dirk Behme
2024-11-11 13:51 ` Andreas Hindborg
2024-11-12 5:35 ` Dirk Behme
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20241111112615.179133-5-alistair@alistair23.me \
--to=alistair@alistair23.me \
--cc=a.hindborg@kernel.org \
--cc=alex.gaynor@gmail.com \
--cc=aliceryhl@google.com \
--cc=alistair.francis@wdc.com \
--cc=alistair23@gmail.com \
--cc=benno.lossin@proton.me \
--cc=bjorn3_gh@protonmail.com \
--cc=boqun.feng@gmail.com \
--cc=gary@garyguo.net \
--cc=linux-kernel@vger.kernel.org \
--cc=me@kloenk.dev \
--cc=ojeda@kernel.org \
--cc=rust-for-linux@vger.kernel.org \
--cc=tmgross@umich.edu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).