rust/kernel/device.rs | 19 ++++++++++++------- rust/kernel/seq_file.rs | 12 ++++++++++-- 2 files changed, 22 insertions(+), 9 deletions(-)
C-String literals were added in Rust 1.77. Replace instances of
`kernel::c_str!` with C-String literals where possible.
This patch updates seq_file and device modules to use the native
C-string literal syntax (c"...") instead of the kernel::c_str! macro.
While at it, convert imports to the kernel vertical import style.
Signed-off-by: Ryan Foster <foster.ryan.r@gmail.com>
---
rust/kernel/device.rs | 19 ++++++++++++-------
rust/kernel/seq_file.rs | 12 ++++++++++--
2 files changed, 22 insertions(+), 9 deletions(-)
diff --git a/rust/kernel/device.rs b/rust/kernel/device.rs
index 71b200df0f40..a87350c1a67d 100644
--- a/rust/kernel/device.rs
+++ b/rust/kernel/device.rs
@@ -5,15 +5,20 @@
//! C header: [`include/linux/device.h`](srctree/include/linux/device.h)
use crate::{
- bindings, fmt,
+ bindings,
+ fmt,
prelude::*,
sync::aref::ARef,
- types::{ForeignOwnable, Opaque},
+ types::{
+ ForeignOwnable,
+ Opaque, //
+ }, //
+};
+use core::{
+ any::TypeId,
+ marker::PhantomData,
+ ptr, //
};
-use core::{any::TypeId, marker::PhantomData, ptr};
-
-#[cfg(CONFIG_PRINTK)]
-use crate::c_str;
pub mod property;
@@ -462,7 +467,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>(),
)
};
diff --git a/rust/kernel/seq_file.rs b/rust/kernel/seq_file.rs
index 855e533813a6..109ad6670907 100644
--- a/rust/kernel/seq_file.rs
+++ b/rust/kernel/seq_file.rs
@@ -4,7 +4,15 @@
//!
//! C header: [`include/linux/seq_file.h`](srctree/include/linux/seq_file.h)
-use crate::{bindings, c_str, fmt, str::CStrExt as _, types::NotThreadSafe, types::Opaque};
+use crate::{
+ bindings,
+ fmt,
+ str::CStrExt as _,
+ types::{
+ NotThreadSafe,
+ Opaque, //
+ }, //
+};
/// A utility for generating the contents of a seq file.
#[repr(transparent)]
@@ -36,7 +44,7 @@ pub fn call_printf(&self, args: fmt::Arguments<'_>) {
unsafe {
bindings::seq_printf(
self.inner.get(),
- c_str!("%pA").as_char_ptr(),
+ c"%pA".as_char_ptr(),
core::ptr::from_ref(&args).cast::<crate::ffi::c_void>(),
);
}
--
2.52.0
On Tue Jan 20, 2026 at 2:59 PM GMT, Ryan Foster wrote: > C-String literals were added in Rust 1.77. Replace instances of > `kernel::c_str!` with C-String literals where possible. > > This patch updates seq_file and device modules to use the native > C-string literal syntax (c"...") instead of the kernel::c_str! macro. > > While at it, convert imports to the kernel vertical import style. > > Signed-off-by: Ryan Foster <foster.ryan.r@gmail.com> Reviewed-by: Gary Guo <gary@garyguo.net> > --- > rust/kernel/device.rs | 19 ++++++++++++------- > rust/kernel/seq_file.rs | 12 ++++++++++-- > 2 files changed, 22 insertions(+), 9 deletions(-)
On Tue, Jan 20, 2026 at 10:17 AM Gary Guo <gary@garyguo.net> wrote: > > On Tue Jan 20, 2026 at 2:59 PM GMT, Ryan Foster wrote: > > C-String literals were added in Rust 1.77. Replace instances of > > `kernel::c_str!` with C-String literals where possible. > > > > This patch updates seq_file and device modules to use the native > > C-string literal syntax (c"...") instead of the kernel::c_str! macro. > > > > While at it, convert imports to the kernel vertical import style. > > > > Signed-off-by: Ryan Foster <foster.ryan.r@gmail.com> > > Reviewed-by: Gary Guo <gary@garyguo.net> device.rs was done in https://lore.kernel.org/all/20251222-cstr-driver-core-v1-0-1142a177d0fd@gmail.com/ and seq_file.rs is waiting for a maintainer's ack in https://lore.kernel.org/all/20251222-cstr-vfs-v1-1-18e3d327cbd7@gmail.com/.
© 2016 - 2026 Red Hat, Inc.