[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20251018180319.3615829-1-aliceryhl@google.com>
Date: Sat, 18 Oct 2025 18:03:19 +0000
From: Alice Ryhl <aliceryhl@...gle.com>
To: tamird@...il.com
Cc: Liam.Howlett@...cle.com, a.hindborg@...nel.org, airlied@...il.com,
alex.gaynor@...il.com, aliceryhl@...gle.com, arve@...roid.com,
axboe@...nel.dk, bhelgaas@...gle.com, bjorn3_gh@...tonmail.com,
boqun.feng@...il.com, brauner@...nel.org, broonie@...nel.org,
cmllamas@...gle.com, dakr@...nel.org, dri-devel@...ts.freedesktop.org,
gary@...yguo.net, gregkh@...uxfoundation.org, jack@...e.cz,
joelagnelf@...dia.com, justinstitt@...gle.com, kwilczynski@...nel.org,
leitao@...ian.org, lgirdwood@...il.com, linux-block@...r.kernel.org,
linux-clk@...r.kernel.org, linux-fsdevel@...r.kernel.org,
linux-kernel@...r.kernel.org, linux-pci@...r.kernel.org,
linux-pm@...r.kernel.org, llvm@...ts.linux.dev, longman@...hat.com,
lorenzo.stoakes@...cle.com, lossin@...nel.org, maco@...roid.com,
mcgrof@...nel.org, mingo@...hat.com, mmaurer@...gle.com, morbo@...gle.com,
mturquette@...libre.com, nathan@...nel.org, nick.desaulniers+lkml@...il.com,
nm@...com, ojeda@...nel.org, peterz@...radead.org, rafael@...nel.org,
russ.weight@...ux.dev, rust-for-linux@...r.kernel.org, sboyd@...nel.org,
simona@...ll.ch, surenb@...gle.com, tkjos@...roid.com, tmgross@...ch.edu,
urezki@...il.com, vbabka@...e.cz, vireshk@...nel.org, viro@...iv.linux.org.uk,
will@...nel.org
Subject: [PATCH v18 14/16] rust: clk: use `CStr::as_char_ptr`
From: Tamir Duberstein <tamird@...il.com>
Replace the use of `as_ptr` which works through `<CStr as
Deref<Target=&[u8]>::deref()` in preparation for replacing
`kernel::str::CStr` with `core::ffi::CStr` as the latter does not
implement `Deref<Target=&[u8]>`.
Signed-off-by: Tamir Duberstein <tamird@...il.com>
Signed-off-by: Alice Ryhl <aliceryhl@...gle.com>
---
rust/kernel/clk.rs | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/rust/kernel/clk.rs b/rust/kernel/clk.rs
index 1e6c8c42fb3a..c1cfaeaa36a2 100644
--- a/rust/kernel/clk.rs
+++ b/rust/kernel/clk.rs
@@ -136,7 +136,7 @@ impl Clk {
///
/// [`clk_get`]: https://docs.kernel.org/core-api/kernel-api.html#c.clk_get
pub fn get(dev: &Device, name: Option<&CStr>) -> Result<Self> {
- let con_id = name.map_or(ptr::null(), |n| n.as_ptr());
+ let con_id = name.map_or(ptr::null(), |n| n.as_char_ptr());
// SAFETY: It is safe to call [`clk_get`] for a valid device pointer.
//
@@ -304,7 +304,7 @@ impl OptionalClk {
/// [`clk_get_optional`]:
/// https://docs.kernel.org/core-api/kernel-api.html#c.clk_get_optional
pub fn get(dev: &Device, name: Option<&CStr>) -> Result<Self> {
- let con_id = name.map_or(ptr::null(), |n| n.as_ptr());
+ let con_id = name.map_or(ptr::null(), |n| n.as_char_ptr());
// SAFETY: It is safe to call [`clk_get_optional`] for a valid device pointer.
//
--
2.51.0.915.g61a8936c21-goog
Powered by blists - more mailing lists