[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20251018180313.3615630-1-aliceryhl@google.com>
Date: Sat, 18 Oct 2025 18:03:12 +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 13/16] rust: regulator: 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/regulator.rs | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/rust/kernel/regulator.rs b/rust/kernel/regulator.rs
index b55a201e5029..65a4eb096cae 100644
--- a/rust/kernel/regulator.rs
+++ b/rust/kernel/regulator.rs
@@ -84,7 +84,7 @@ pub struct Error<State: RegulatorState> {
pub fn devm_enable(dev: &Device<Bound>, name: &CStr) -> Result {
// SAFETY: `dev` is a valid and bound device, while `name` is a valid C
// string.
- to_result(unsafe { bindings::devm_regulator_get_enable(dev.as_raw(), name.as_ptr()) })
+ to_result(unsafe { bindings::devm_regulator_get_enable(dev.as_raw(), name.as_char_ptr()) })
}
/// Same as [`devm_enable`], but calls `devm_regulator_get_enable_optional`
@@ -102,7 +102,9 @@ pub fn devm_enable(dev: &Device<Bound>, name: &CStr) -> Result {
pub fn devm_enable_optional(dev: &Device<Bound>, name: &CStr) -> Result {
// SAFETY: `dev` is a valid and bound device, while `name` is a valid C
// string.
- to_result(unsafe { bindings::devm_regulator_get_enable_optional(dev.as_raw(), name.as_ptr()) })
+ to_result(unsafe {
+ bindings::devm_regulator_get_enable_optional(dev.as_raw(), name.as_char_ptr())
+ })
}
/// A `struct regulator` abstraction.
@@ -268,7 +270,8 @@ pub fn get_voltage(&self) -> Result<Voltage> {
fn get_internal(dev: &Device, name: &CStr) -> Result<Regulator<T>> {
// SAFETY: It is safe to call `regulator_get()`, on a device pointer
// received from the C code.
- let inner = from_err_ptr(unsafe { bindings::regulator_get(dev.as_raw(), name.as_ptr()) })?;
+ let inner =
+ from_err_ptr(unsafe { bindings::regulator_get(dev.as_raw(), name.as_char_ptr()) })?;
// SAFETY: We can safely trust `inner` to be a pointer to a valid
// regulator if `ERR_PTR` was not returned.
--
2.51.0.915.g61a8936c21-goog
Powered by blists - more mailing lists