[PATCH v2 18/19] rust: io: replace `kernel::c_str!` with C-Strings
From: Tamir Duberstein <hidden>
Date: 2025-09-25 13:56:08
Also in:
dri-devel, linux-block, linux-clk, linux-fsdevel, linux-kselftest, linux-pci, linux-pm, lkml, nouveau, rust-for-linux
Subsystem:
device i/o & irq [rust], rust, the rest · Maintainers:
Danilo Krummrich, Alice Ryhl, Daniel Almeida, Miguel Ojeda, Linus Torvalds
C-String literals were added in Rust 1.77. Replace instances of `kernel::c_str!` with C-String literals where possible. Signed-off-by: Tamir Duberstein <redacted> --- rust/kernel/io/mem.rs | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/rust/kernel/io/mem.rs b/rust/kernel/io/mem.rs
index 6f99510bfc3a..2e42eb906061 100644
--- a/rust/kernel/io/mem.rs
+++ b/rust/kernel/io/mem.rs@@ -4,7 +4,6 @@ use core::ops::Deref; -use crate::c_str; use crate::device::Bound; use crate::device::Device; use crate::devres::Devres;
@@ -44,7 +43,7 @@ pub(crate) unsafe fn new(device: &'a Device<Bound>, resource: &'a Resource) -> S /// illustration purposes. /// /// ```no_run - /// use kernel::{bindings, c_str, platform, of, device::Core}; + /// use kernel::{bindings, platform, of, device::Core}; /// struct SampleDriver; /// /// impl platform::Driver for SampleDriver {
@@ -102,7 +101,7 @@ pub fn iomap_exclusive_sized<const SIZE: usize>( /// illustration purposes. /// /// ```no_run - /// use kernel::{bindings, c_str, platform, of, device::Core}; + /// use kernel::{bindings, platform, of, device::Core}; /// struct SampleDriver; /// /// impl platform::Driver for SampleDriver {
@@ -164,7 +163,7 @@ impl<const SIZE: usize> ExclusiveIoMem<SIZE> { fn ioremap(resource: &Resource) -> Result<Self> { let start = resource.start(); let size = resource.size(); - let name = resource.name().unwrap_or(c_str!("")); + let name = resource.name().unwrap_or_default(); let region = resource .request_region(
--
2.51.0