Commit e1cd24af authored Jan 16, 2025 by Viresh Kumar Committed by Greg Kroah-Hartman Jan 16, 2025

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>

parent 2485f8e8

rust/kernel/device.rs

+3 −3

Original line number	Diff line number	Diff line
		@@ -6,7 +6,7 @@

		use crate::{
		bindings,
		str::CString,
		str::CStr,
		types::{ARef, Opaque},
		};
		use core::{fmt, ptr};
		@@ -183,8 +183,8 @@ unsafe fn printk(&self, klevel: &[u8], msg: fmt::Arguments<'_>) {
		}

		/// 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 _) }
		}
		}