From nobody Sat Feb 7 22:21:19 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 938CB299A8F; Mon, 22 Dec 2025 12:32:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766406760; cv=none; b=JUpAOoQ7b/kw+LubfeXTYb8aAQjgFxewBiSrmkdWaFhsuwTJoDaVm5J8TQ1P70sdLXhFqrrlAoCXpyWIGAQ1sCwlWp3ARdF9EHn7YukWQ1pUJZ6jkOBYbIXNGZ6fzNxVdlBSHK0C44Ff0e7mlrYDeD9VR4yF/9iOxXvNduthXQo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766406760; c=relaxed/simple; bh=ZTQvplbOEMMHxXaYqiZzYFUmEN08twJ2eCRVSFv3I0Y=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Jf3yLzL8vbBuSjlLoyUnnzY3n4SMd4gwNqvBEabDQMa2HL/54qYY2YrHgZLP2n3Ao93xz7JGqIdqtxV6PI3FhB+0y3nuPyaai/4Ktyarocf/lWTV9pLw5NKP7Uf5PPPkAqtvuXtdRfMAl59R/b6+9v8nbVbAgTlO3DcttbfRr7A= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=BM9gNI+t; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="BM9gNI+t" Received: by smtp.kernel.org (Postfix) with ESMTPSA id B416FC113D0; Mon, 22 Dec 2025 12:32:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1766406760; bh=ZTQvplbOEMMHxXaYqiZzYFUmEN08twJ2eCRVSFv3I0Y=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=BM9gNI+t4li5Pkko3kpRifZsH+y7Kuew/+khqRpu99B3vq2Tt9fgn3T1KNr3zCO2t zTNVhoPF4/lH3mfhhRL5ILOjOUYu/J1k/o76GQvzR2OQ3imDA50fB98PcQzykqNHSm e7YtWvd1M186FZs/7hv7gk0H+SOTetoiWpAjaDThGVMcJrDuErMNQV5ohTsdE6wCPF eVWWM5dyz+ZFHQaN3hfo1MfaR25Xh38RPUg9nkpl7Q5nKUuIKJnirse00GZX+bnBTv wM0WZqoBlUYzAGeKmmY33j89InbeD5aOOzkzrtqV/bGiFoCWZdsHctbrMIh0IwYF4l aBILS8cBSy52g== From: Tamir Duberstein Date: Mon, 22 Dec 2025 13:32:27 +0100 Subject: [PATCH 1/2] rust: net: replace `kernel::c_str!` with C-Strings Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20251222-cstr-net-v1-1-cd9e30a5467e@gmail.com> References: <20251222-cstr-net-v1-0-cd9e30a5467e@gmail.com> In-Reply-To: <20251222-cstr-net-v1-0-cd9e30a5467e@gmail.com> To: FUJITA Tomonori , Trevor Gross , Miguel Ojeda , Boqun Feng , Gary Guo , =?utf-8?q?Bj=C3=B6rn_Roy_Baron?= , Benno Lossin , Andreas Hindborg , Alice Ryhl , Danilo Krummrich , Andrew Lunn , Heiner Kallweit , Russell King , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni Cc: netdev@vger.kernel.org, rust-for-linux@vger.kernel.org, linux-kernel@vger.kernel.org, Tamir Duberstein , Greg Kroah-Hartman X-Mailer: b4 0.15-dev X-Developer-Signature: v=1; a=openssh-sha256; t=1766406749; l=1712; i=tamird@gmail.com; h=from:subject:message-id; bh=HcspC81hb5Ldki8q3pxmBaVR9zMPXvkj5LMt9l+0xEI=; b=U1NIU0lHAAAAAQAAADMAAAALc3NoLWVkMjU1MTkAAAAgtYz36g7iDMSkY5K7Ab51ksGX7hJgs MRt+XVZTrIzMVIAAAAGcGF0YXR0AAAAAAAAAAZzaGE1MTIAAABTAAAAC3NzaC1lZDI1NTE5AAAA QMATpdWSmj+tzLGnMBWC7Pt+kve4W0s8rHOwv13z4SrjlTTMJHX7JJbV+op4NX6OrJ8hABYuvqb La3ITrRzPSwI= X-Developer-Key: i=tamird@gmail.com; a=openssh; fpr=SHA256:264rPmnnrb+ERkS7DDS3tuwqcJss/zevJRzoylqMsbc From: Tamir Duberstein C-String literals were added in Rust 1.77. Replace instances of `kernel::c_str!` with C-String literals where possible. Acked-by: Greg Kroah-Hartman Reviewed-by: Alice Ryhl Reviewed-by: Benno Lossin Signed-off-by: Tamir Duberstein Reviewed-by: Daniel Almeida Reviewed-by: FUJITA Tomonori --- rust/kernel/net/phy.rs | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/rust/kernel/net/phy.rs b/rust/kernel/net/phy.rs index bf6272d87a7b..3ca99db5cccf 100644 --- a/rust/kernel/net/phy.rs +++ b/rust/kernel/net/phy.rs @@ -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 =3D c_str!("PhySample"); +/// const NAME: &'static CStr =3D c"PhySample"; /// const PHY_DEVICE_ID: phy::DeviceId =3D phy::DeviceId::new_with_exa= ct_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 =3D c_str!("PhySample"); +/// const NAME: &'static CStr =3D c"PhySample"; /// const PHY_DEVICE_ID: phy::DeviceId =3D phy::DeviceId::new_with_exa= ct_mask(0x00000001); /// } /// --=20 2.52.0 From nobody Sat Feb 7 22:21:19 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 15E1629A9C9; Mon, 22 Dec 2025 12:32:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766406766; cv=none; b=rJKDsrOp7mjrNuVwuHTLBF0g2InzWK+F9RwKqOua6+2L5Rs6MezB67PErqXTRnu9GNA+ZZ/KJoIf7B+x2KtCcvJ54tIEZQgkn3T5P9XgmdgXI4LYMCEcG14VXxXvm2OyRx/TDuqs7ZgcMLn0EI1abIFNKRzGKPS70Ingq1R5qLQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766406766; c=relaxed/simple; bh=rVJgVGH4Fpaz3UiKYsv72cjgvV26VOoXo87zsGHkKME=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=O8RRTvQKMBb1mWYlrA5FmTQ96QbsH/zWA6zhZtbnTiqR4ZsA0Qj++Kta5kWSPRKbGYHvwz2shui4GxAw0gm+JDSGIvZGpioeuQM+3T83MnvPuNzXg7HYc0s/dCy1CtvS/EYXWLSTRYzLcoCVkN+e/Dcxe+TyqI9NZWCOIrEykds= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=G4NNOnN+; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="G4NNOnN+" Received: by smtp.kernel.org (Postfix) with ESMTPSA id EDE53C116C6; Mon, 22 Dec 2025 12:32:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1766406765; bh=rVJgVGH4Fpaz3UiKYsv72cjgvV26VOoXo87zsGHkKME=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=G4NNOnN+0FP0h2QkzoFp7+mtrrWHQoy3YhHlFfvp1LvJmr3V8XAyTFuZOfLp4XCC0 4xzXx9VVyvhbT6Y/YlTBDIqexCVKQWKkofSegSMZRGnklv3v5VUBzTZBpT7M/pwQ8+ PQWOn3F6hKEIXjmYREVGN4QrijmgnGQgE7zZB49I2qNz+umysgQHlCTXE/aXeZ/7wS NJSz+ODU7ieieILpt0k2tgPqIanBbqTsUsan/LbQnJKpkg5NCIKlVU6N7CnnZGMNdo mABVJZiSdDjieT8NZlmNJ9I/Uwp7veKrmEMUbIYSchehGmSt9P6hrJd7dj87T2d3id G/fnlVNkqMqcw== From: Tamir Duberstein Date: Mon, 22 Dec 2025 13:32:28 +0100 Subject: [PATCH 2/2] drivers: net: replace `kernel::c_str!` with C-Strings Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20251222-cstr-net-v1-2-cd9e30a5467e@gmail.com> References: <20251222-cstr-net-v1-0-cd9e30a5467e@gmail.com> In-Reply-To: <20251222-cstr-net-v1-0-cd9e30a5467e@gmail.com> To: FUJITA Tomonori , Trevor Gross , Miguel Ojeda , Boqun Feng , Gary Guo , =?utf-8?q?Bj=C3=B6rn_Roy_Baron?= , Benno Lossin , Andreas Hindborg , Alice Ryhl , Danilo Krummrich , Andrew Lunn , Heiner Kallweit , Russell King , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni Cc: netdev@vger.kernel.org, rust-for-linux@vger.kernel.org, linux-kernel@vger.kernel.org, Tamir Duberstein , Greg Kroah-Hartman X-Mailer: b4 0.15-dev X-Developer-Signature: v=1; a=openssh-sha256; t=1766406750; l=3383; i=tamird@gmail.com; h=from:subject:message-id; bh=zXV+NZPWpohaJE1iUOz8SzewbnqLoHtSzsEhxH3GDh8=; b=U1NIU0lHAAAAAQAAADMAAAALc3NoLWVkMjU1MTkAAAAgtYz36g7iDMSkY5K7Ab51ksGX7hJgs MRt+XVZTrIzMVIAAAAGcGF0YXR0AAAAAAAAAAZzaGE1MTIAAABTAAAAC3NzaC1lZDI1NTE5AAAA QIZ8AvJlJQ8Z8jdj0WqLoIE+Cg9btKGt2Zp8gNpS6sev9NuvTN5UzE/AatduG+JGiI84B2Ogy+1 vjd2PvFivyw8= X-Developer-Key: i=tamird@gmail.com; a=openssh; fpr=SHA256:264rPmnnrb+ERkS7DDS3tuwqcJss/zevJRzoylqMsbc From: Tamir Duberstein C-String literals were added in Rust 1.77. Replace instances of `kernel::c_str!` with C-String literals where possible. Acked-by: Greg Kroah-Hartman Reviewed-by: Alice Ryhl Reviewed-by: Benno Lossin Signed-off-by: Tamir Duberstein Reviewed-by: Daniel Almeida Reviewed-by: FUJITA Tomonori --- drivers/net/phy/ax88796b_rust.rs | 7 +++---- drivers/net/phy/qt2025.rs | 5 ++--- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/drivers/net/phy/ax88796b_rust.rs b/drivers/net/phy/ax88796b_ru= st.rs index bc73ebccc2aa..2d24628a4e58 100644 --- a/drivers/net/phy/ax88796b_rust.rs +++ b/drivers/net/phy/ax88796b_rust.rs @@ -5,7 +5,6 @@ //! //! C version of this driver: [`drivers/net/phy/ax88796b.c`](./ax88796b.c) use kernel::{ - c_str, net::phy::{self, reg::C22, DeviceId, Driver}, prelude::*, uapi, @@ -41,7 +40,7 @@ fn asix_soft_reset(dev: &mut phy::Device) -> Result { #[vtable] impl Driver for PhyAX88772A { const FLAGS: u32 =3D phy::flags::IS_INTERNAL; - const NAME: &'static CStr =3D c_str!("Asix Electronics AX88772A"); + const NAME: &'static CStr =3D c"Asix Electronics AX88772A"; const PHY_DEVICE_ID: DeviceId =3D DeviceId::new_with_exact_mask(0x003b= 1861); =20 // AX88772A is not working properly with some old switches (NETGEAR EN= 108TP): @@ -105,7 +104,7 @@ fn link_change_notify(dev: &mut phy::Device) { #[vtable] impl Driver for PhyAX88772C { const FLAGS: u32 =3D phy::flags::IS_INTERNAL; - const NAME: &'static CStr =3D c_str!("Asix Electronics AX88772C"); + const NAME: &'static CStr =3D c"Asix Electronics AX88772C"; const PHY_DEVICE_ID: DeviceId =3D DeviceId::new_with_exact_mask(0x003b= 1881); =20 fn suspend(dev: &mut phy::Device) -> Result { @@ -125,7 +124,7 @@ fn soft_reset(dev: &mut phy::Device) -> Result { =20 #[vtable] impl Driver for PhyAX88796B { - const NAME: &'static CStr =3D c_str!("Asix Electronics AX88796B"); + const NAME: &'static CStr =3D c"Asix Electronics AX88796B"; const PHY_DEVICE_ID: DeviceId =3D DeviceId::new_with_model_mask(0x003b= 1841); =20 fn soft_reset(dev: &mut phy::Device) -> Result { diff --git a/drivers/net/phy/qt2025.rs b/drivers/net/phy/qt2025.rs index aaaead6512a0..470d89a0ac00 100644 --- a/drivers/net/phy/qt2025.rs +++ b/drivers/net/phy/qt2025.rs @@ -9,7 +9,6 @@ //! //! The QT2025 PHY integrates an Intel 8051 micro-controller. =20 -use kernel::c_str; use kernel::error::code; use kernel::firmware::Firmware; use kernel::io::poll::read_poll_timeout; @@ -38,7 +37,7 @@ =20 #[vtable] impl Driver for PhyQT2025 { - const NAME: &'static CStr =3D c_str!("QT2025 10Gpbs SFP+"); + const NAME: &'static CStr =3D c"QT2025 10Gpbs SFP+"; const PHY_DEVICE_ID: phy::DeviceId =3D phy::DeviceId::new_with_exact_m= ask(0x0043a400); =20 fn probe(dev: &mut phy::Device) -> Result<()> { @@ -71,7 +70,7 @@ fn probe(dev: &mut phy::Device) -> Result<()> { // The micro-controller will start running from the boot ROM. dev.write(C45::new(Mmd::PCS, 0xe854), 0x00c0)?; =20 - let fw =3D Firmware::request(c_str!("qt2025-2.0.3.3.fw"), dev.as_r= ef())?; + let fw =3D Firmware::request(c"qt2025-2.0.3.3.fw", dev.as_ref())?; if fw.data().len() > SZ_16K + SZ_8K { return Err(code::EFBIG); } --=20 2.52.0