From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id C41CECCD187 for ; Mon, 6 Oct 2025 20:58:18 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 220E410E636; Mon, 6 Oct 2025 20:58:00 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=permerror (0-bit key) header.d=gmail.com header.i=@gmail.com header.b="US8OBXa8"; dkim-atps=neutral Received: from mail-qk1-f182.google.com (mail-qk1-f182.google.com [209.85.222.182]) by gabe.freedesktop.org (Postfix) with ESMTPS id A896510E932 for ; Thu, 25 Sep 2025 13:54:20 +0000 (UTC) Received: by mail-qk1-f182.google.com with SMTP id af79cd13be357-80b7a6b2b47so128230385a.0 for ; Thu, 25 Sep 2025 06:54:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1758808459; x=1759413259; darn=lists.freedesktop.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=NalRugr56a/X75BPbSyIQMh/LBa9oMHO7W+8WbDPYnY=; b=US8OBXa81NWrF+uNyzWhHkXqMPikMuhqKNdXAH6fBZSc9yBwWsK6qbjNT5E85JJCwU kM2zTXbjocUUX1R2pY/MfRr8ji2XIOccwcM+otANB0FYT3unhekLgbAz7ipdm5iMHIoE +sBTJ9J/TKH9WGRJUYKWeKzwMUu+O+nU4MLyJBSa5aO5R0jU4OdSQvMHM1WpD5Rpc/F7 k0LvkllS0UJb3kHaodpJ0LdG2jr/QERalYlH01hluwaL8LnfNRtohtR3JcGqgZ772nQA dQNjBH6o98VTiiQYOidmJdC0xypCZaKiv6//s8ZkDJ5rDA7GZ5pTIJEMFSsyEzTe8Cpl 9fVg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1758808459; x=1759413259; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=NalRugr56a/X75BPbSyIQMh/LBa9oMHO7W+8WbDPYnY=; b=llWZASSZrYUbVkxqphxlTQgz01IgDeREZU1qFE8dz5t+DKkeeR0Gy7SFc1n+xlU/Ur dcJ6TWX3di1fdzq3tLKpAc533pJfZOpIuoZHRHMsg7CFiAEYjsWDzTAjC3mHaMNTfj9l 7kMpFf69SSGP5Y0d5Mp9PjvIjk38EsJF7Kd4AKWYShxouZZrjFehOtMxlp31Lw+4FiCV r3mjWrltS5Z+BDWuxQdcf+ggskVPuOugAYcC0WOMbr3kttDvdjQr1NMZyV7Pr7IO2G7a 7K/Qmk3hN4fwmdusMMqvmluBtEgZu4YLUClgaic+D3kp91x90z7hL5JTk6dnCJH/jSpe 6IVQ== X-Forwarded-Encrypted: i=1; AJvYcCUeuMenzNGpHTKCW133J6ukcs2bVV05C/Vp1l0hFOFaqSELENKSInTtQ0nbyt2tVGUc8NpWp0LV@lists.freedesktop.org X-Gm-Message-State: AOJu0Yw/kRhNSoKXYLCRReGaRD5rpH0xsrxtRFZZOSp7SSTQqSceHftC EYeYXi+zXP4560UWfY3HkBJ+sZlDD4aNbjJKBOFWZqHip3cAxKITPXwY X-Gm-Gg: ASbGncuGQEQCs/cX47CnFDrf/PgRMGrzdU39gMOOvQMLDG0tL9DK/nUU1zGLnXTjzOT N7si4NaR43YNGnjRODfoPu33AbEP6uWCRrbcyzJFM5cbhgjcGaw7WnavvbNk80PjijzMyzdh2ns SirPH7vJkef2dg1TDqwjhwekxOio+fSd5jy9bMA87u3PyKuIwyeEOMK+Vdy6ZXR/19d+x7CYMnQ Sgb6sH/usymgxHZU3Qp1XXG0FrpRLqhMDuaVVUvxGZzmjAdgC6UMnga8yO9Cl77U5+ALTjQccOg ggsKw4VYzRPwXcYn3cBK4CDhEGCEyeuA4roHXMeW6B4/3NBqkrf9pZY2kKergC18TwvGDjgUisz DBrbMDl94MsZW+X4EUaSDleexa7Ln1N8CoIC4Yp0bI5rKTwUXrsiwfgGhYTm0Lb5VVodsrViMmA 3xBgqPes+mr9Kxqo11FjMsqFIVi0lj9awLDbrADtCchl9GNQSNVc7B+HtcszMOlPMu6uVs X-Google-Smtp-Source: AGHT+IGDJTlODDEEGMd+XqS6TrdaLhozVUbA41arvcw2luGPWfwQ5X2fWdHexXOWX/V4ddEWfD+pug== X-Received: by 2002:a05:6214:500e:b0:784:bd2b:abbf with SMTP id 6a1803df08f44-7fc39460bacmr55347756d6.24.1758808459061; Thu, 25 Sep 2025 06:54:19 -0700 (PDT) Received: from 137.1.168.192.in-addr.arpa ([2600:4808:6353:5c00:7c:b286:dba3:5ba8]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-80135968d5esm11536916d6.12.2025.09.25.06.54.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Sep 2025 06:54:18 -0700 (PDT) From: Tamir Duberstein Date: Thu, 25 Sep 2025 09:53:49 -0400 Subject: [PATCH v2 01/19] drivers: net: replace `kernel::c_str!` with C-Strings MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20250925-core-cstr-cstrings-v2-1-78e0aaace1cd@gmail.com> References: <20250925-core-cstr-cstrings-v2-0-78e0aaace1cd@gmail.com> In-Reply-To: <20250925-core-cstr-cstrings-v2-0-78e0aaace1cd@gmail.com> To: "Rafael J. Wysocki" , Viresh Kumar , Miguel Ojeda , Alex Gaynor , Boqun Feng , Gary Guo , =?utf-8?q?Bj=C3=B6rn_Roy_Baron?= , Benno Lossin , Andreas Hindborg , Alice Ryhl , Trevor Gross , Danilo Krummrich , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , FUJITA Tomonori , Andrew Lunn , Heiner Kallweit , Russell King , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Michael Turquette , Stephen Boyd , Breno Leitao , Greg Kroah-Hartman , Luis Chamberlain , Russ Weight , Dave Ertman , Ira Weiny , Leon Romanovsky , Bjorn Helgaas , =?utf-8?q?Krzysztof_Wilczy=C5=84ski?= , Arnd Bergmann , Brendan Higgins , David Gow , Rae Moar , Jens Axboe , Alexandre Courbot , Alexander Viro , Christian Brauner , Jan Kara , Liam Girdwood , Mark Brown Cc: linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org, rust-for-linux@vger.kernel.org, nouveau@lists.freedesktop.org, dri-devel@lists.freedesktop.org, netdev@vger.kernel.org, linux-clk@vger.kernel.org, linux-pci@vger.kernel.org, linux-kselftest@vger.kernel.org, kunit-dev@googlegroups.com, linux-block@vger.kernel.org, linux-fsdevel@vger.kernel.org, Tamir Duberstein X-Mailer: b4 0.15-dev X-Developer-Signature: v=1; a=openssh-sha256; t=1758808436; l=3366; i=tamird@gmail.com; h=from:subject:message-id; bh=jCTV/tUAugB6kQuG6h16qXAYA9gVjuY3K+nRw8uudBM=; b=U1NIU0lHAAAAAQAAADMAAAALc3NoLWVkMjU1MTkAAAAgtYz36g7iDMSkY5K7Ab51ksGX7hJgs MRt+XVZTrIzMVIAAAAGcGF0YXR0AAAAAAAAAAZzaGE1MTIAAABTAAAAC3NzaC1lZDI1NTE5AAAA QM5FRv8eNJ3CAtJrq8ctlI58A1uhfnem30wXWxndQdEjlI88vgu5PfmeFU3nqX15SZ72W8uXUUc 90i73MD8nTAw= X-Developer-Key: i=tamird@gmail.com; a=openssh; fpr=SHA256:264rPmnnrb+ERkS7DDS3tuwqcJss/zevJRzoylqMsbc X-Mailman-Approved-At: Mon, 06 Oct 2025 20:57:16 +0000 X-BeenThere: nouveau@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Nouveau development list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: nouveau-bounces@lists.freedesktop.org Sender: "Nouveau" 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 --- 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_rust.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 = phy::flags::IS_INTERNAL; - const NAME: &'static CStr = c_str!("Asix Electronics AX88772A"); + const NAME: &'static CStr = c"Asix Electronics AX88772A"; const PHY_DEVICE_ID: DeviceId = DeviceId::new_with_exact_mask(0x003b1861); // 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 = phy::flags::IS_INTERNAL; - const NAME: &'static CStr = c_str!("Asix Electronics AX88772C"); + const NAME: &'static CStr = c"Asix Electronics AX88772C"; const PHY_DEVICE_ID: DeviceId = DeviceId::new_with_exact_mask(0x003b1881); fn suspend(dev: &mut phy::Device) -> Result { @@ -125,7 +124,7 @@ fn soft_reset(dev: &mut phy::Device) -> Result { #[vtable] impl Driver for PhyAX88796B { - const NAME: &'static CStr = c_str!("Asix Electronics AX88796B"); + const NAME: &'static CStr = c"Asix Electronics AX88796B"; const PHY_DEVICE_ID: DeviceId = DeviceId::new_with_model_mask(0x003b1841); fn soft_reset(dev: &mut phy::Device) -> Result { diff --git a/drivers/net/phy/qt2025.rs b/drivers/net/phy/qt2025.rs index 0b9400dcb4c1..9ccc75f70219 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. -use kernel::c_str; use kernel::error::code; use kernel::firmware::Firmware; use kernel::net::phy::{ @@ -36,7 +35,7 @@ #[vtable] impl Driver for PhyQT2025 { - const NAME: &'static CStr = c_str!("QT2025 10Gpbs SFP+"); + const NAME: &'static CStr = c"QT2025 10Gpbs SFP+"; const PHY_DEVICE_ID: phy::DeviceId = phy::DeviceId::new_with_exact_mask(0x0043a400); fn probe(dev: &mut phy::Device) -> Result<()> { @@ -69,7 +68,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)?; - let fw = Firmware::request(c_str!("qt2025-2.0.3.3.fw"), dev.as_ref())?; + let fw = Firmware::request(c"qt2025-2.0.3.3.fw", dev.as_ref())?; if fw.data().len() > SZ_16K + SZ_8K { return Err(code::EFBIG); } -- 2.51.0