Re: [RESEND PATCH v18 13/16] rust: regulator: use `CStr::as_char_ptr`
From: Daniel Almeida <daniel.almeida@collabora.com>
Date: 2025-10-20 15:42:44
Also in:
dri-devel, linux-clk, linux-fsdevel, linux-pci, linux-pm, lkml, llvm, rust-for-linux
quoted hunk ↗ jump to hunk
On 18 Oct 2025, at 16:16, Tamir Duberstein [off-list ref] wrote: From: Tamir Duberstein <redacted> 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 <redacted> --- 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.1
Reviewed-by: Daniel Almeida <daniel.almeida@collabora.com>