summaryrefslogtreecommitdiff
path: root/rust/kernel/device.rs
diff options
context:
space:
mode:
authorViresh Kumar <viresh.kumar@linaro.org>2025-01-16 08:26:21 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2025-01-16 13:07:27 +0300
commite1cd24af8ff2ad7e26e1711be3d7bd72eef24279 (patch)
treec49c3cd6e934a973ebd892b60ac01235bfeab231 /rust/kernel/device.rs
parent2485f8e8c4d543c2996ec409d98e692761e55bac (diff)
downloadlinux-e1cd24af8ff2ad7e26e1711be3d7bd72eef24279.tar.xz
rust: device: Replace CString with CStr in property_present()
The property_present() method expects a &CString currently and will work only with heap allocated C strings. In order to make it work with compile-time string constants too, change the argument type to &CStr. Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org> Reviewed-by: Alice Ryhl <aliceryhl@google.com> Link: https://lore.kernel.org/r/e97dcbe0418cc1053fb4bcfac65cc02a0afcdf78.1737005078.git.viresh.kumar@linaro.org Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'rust/kernel/device.rs')
-rw-r--r--rust/kernel/device.rs6
1 files changed, 3 insertions, 3 deletions
diff --git a/rust/kernel/device.rs b/rust/kernel/device.rs
index eadc6160a4be..c6823decbb2e 100644
--- a/rust/kernel/device.rs
+++ b/rust/kernel/device.rs
@@ -6,7 +6,7 @@
use crate::{
bindings,
- str::CString,
+ str::CStr,
types::{ARef, Opaque},
};
use core::{fmt, ptr};
@@ -183,8 +183,8 @@ impl Device {
}
/// Checks if property is present or not.
- pub fn property_present(&self, name: &CString) -> bool {
- // SAFETY: By the invariant of `CString`, `name` is null-terminated.
+ pub fn property_present(&self, name: &CStr) -> bool {
+ // SAFETY: By the invariant of `CStr`, `name` is null-terminated.
unsafe { bindings::device_property_present(self.as_raw().cast_const(), name.as_ptr() as *const _) }
}
}