Commit 7a8461a2 authored by Tamir Duberstein's avatar Tamir Duberstein Committed by Jakub Kicinski
Browse files

rust: net: 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>
Reviewed-by: default avatarFUJITA Tomonori <fujita.tomonori@gmail.com>
Reviewed-by: default avatarDaniel Almeida <daniel.almeida@collabora.com>
Signed-off-by: default avatarTamir Duberstein <tamird@gmail.com>
Link: https://patch.msgid.link/20260103-cstr-net-v2-1-8688f504b85d@gmail.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 32291cb0

rust/kernel/net/phy.rs

+2 −4
Original line number Diff line number Diff line
@@ -777,7 +777,6 @@ const fn as_int(&self) -> u32 { 
///

/// ```

/// # mod module_phy_driver_sample {

/// use kernel::c_str;

/// use kernel::net::phy::{self, DeviceId};

/// use kernel::prelude::*;

///
@@ -796,7 +795,7 @@ const fn as_int(&self) -> u32 { 
///

/// #[vtable]

/// impl phy::Driver for PhySample {

///     const NAME: &'static CStr = c_str!("PhySample");

///     const NAME: &'static CStr = c"PhySample";

///     const PHY_DEVICE_ID: phy::DeviceId = phy::DeviceId::new_with_exact_mask(0x00000001);

/// }

/// # }
@@ -805,7 +804,6 @@ const fn as_int(&self) -> u32 { 
/// This expands to the following code:

///

/// ```ignore

/// use kernel::c_str;

/// use kernel::net::phy::{self, DeviceId};

/// use kernel::prelude::*;

///
@@ -825,7 +823,7 @@ const fn as_int(&self) -> u32 { 
///

/// #[vtable]

/// impl phy::Driver for PhySample {

///     const NAME: &'static CStr = c_str!("PhySample");

///     const NAME: &'static CStr = c"PhySample";

///     const PHY_DEVICE_ID: phy::DeviceId = phy::DeviceId::new_with_exact_mask(0x00000001);

/// }

///