Commit f0c6ea85 authored by Tamir Duberstein's avatar Tamir Duberstein Committed by Danilo Krummrich
Browse files

rust: device: replace `kernel::c_str!` with C-Strings 



C-String literals were added in Rust 1.77. Replace instances of
`kernel::c_str!` with C-String literals where possible.

Acked-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Reviewed-by: default avatarAlice Ryhl <aliceryhl@google.com>
Reviewed-by: default avatarBenno Lossin <lossin@kernel.org>
Signed-off-by: default avatarTamir Duberstein <tamird@gmail.com>
Reviewed-by: default avatarDaniel Almeida <daniel.almeida@collabora.com>
Link: https://patch.msgid.link/20251222-cstr-driver-core-v1-2-1142a177d0fd@gmail.com


Signed-off-by: default avatarDanilo Krummrich <dakr@kernel.org>
parent 6fc4b5eb

rust/kernel/device.rs

+1 −3
Original line number Diff line number Diff line
@@ -12,8 +12,6 @@ 
};

use core::{any::TypeId, marker::PhantomData, ptr};



#[cfg(CONFIG_PRINTK)]

use crate::c_str;

use crate::str::CStrExt as _;



pub mod property;
@@ -463,7 +461,7 @@ unsafe fn printk(&self, klevel: &[u8], msg: fmt::Arguments<'_>) { 
            bindings::_dev_printk(

                klevel.as_ptr().cast::<crate::ffi::c_char>(),

                self.as_raw(),

                c_str!("%pA").as_char_ptr(),

                c"%pA".as_char_ptr(),

                core::ptr::from_ref(&msg).cast::<crate::ffi::c_void>(),

            )

        };

rust/kernel/device/property.rs

+3 −3
Original line number Diff line number Diff line
@@ -179,11 +179,11 @@ pub fn property_count_elem<T: PropertyInt>(&self, name: &CStr) -> Result<usize> 
    /// # Examples

    ///

    /// ```

    /// # use kernel::{c_str, device::{Device, property::FwNode}, str::CString};

    /// # use kernel::{device::{Device, property::FwNode}, str::CString};

    /// fn examples(dev: &Device) -> Result {

    ///     let fwnode = dev.fwnode().ok_or(ENOENT)?;

    ///     let b: u32 = fwnode.property_read(c_str!("some-number")).required_by(dev)?;

    ///     if let Some(s) = fwnode.property_read::<CString>(c_str!("some-str")).optional() {

    ///     let b: u32 = fwnode.property_read(c"some-number").required_by(dev)?;

    ///     if let Some(s) = fwnode.property_read::<CString>(c"some-str").optional() {

    ///         // ...

    ///     }

    ///     Ok(())