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 06904C83F17 for ; Thu, 10 Jul 2025 15:31:39 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 88FD310E8F6; Thu, 10 Jul 2025 15:31:37 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="G8H8UlJw"; dkim-atps=neutral Received: from mail-oi1-f179.google.com (mail-oi1-f179.google.com [209.85.167.179]) by gabe.freedesktop.org (Postfix) with ESMTPS id 61B0710E8F6; Thu, 10 Jul 2025 15:31:36 +0000 (UTC) Received: by mail-oi1-f179.google.com with SMTP id 5614622812f47-40b54ee16ddso694288b6e.1; Thu, 10 Jul 2025 08:31:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1752161495; x=1752766295; 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=Thg/YcRGWCxcUDbNpBIJmKFEPbrVlfqS0d2bmRRNzHg=; b=G8H8UlJwnqHgTQHcD6wxxj+gSO5JZwxDAjUKYo3yL/We5ZiirTiZMunuvLQ+LGpPdr M594IKaDiZe1LDmAUGGvtztyKmmAkQLlLp26lFFzo2bewwSxhRmEfMR33jd2gbY//UtZ U4s+7g2wBdbbadnvGNIIUpe/PIpn/w86nUpmlQiuNpVaHABYeygPIVEBXUBuVjjwI45V NCDzgHPiZ+xzZ0Uo7FwpF0TVZGkCjZornlRCgKgObc6fPn+wTAIdmCFAcyzcgBZglo3C qxEWUijSUWs/UF3XRhdKwqsQ8nCPNP+i+K99l3+Ubp62uaVYyP4ZB2dmaOC9IUGnpoSN mpmQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1752161495; x=1752766295; 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=Thg/YcRGWCxcUDbNpBIJmKFEPbrVlfqS0d2bmRRNzHg=; b=HYp6ivX2dph+/v7Rtky1Rm4PxsYKN5G4SFwQDmV3XawCPBWWXJOtKglKu5tzm7KU+y Za0hlraIV/mVkhBZ323KQOvu0to+1YFSZgG/V3ZK48JYRWPK9R8F5iDoZ4Ap88TBdt0A 7Jqie76vaYc8LJdfnf3Y0zq08khzorbWPibzICobdPSGv3ds/C3l5wiVeLyIJprQIfW5 6y4tkB+ebObWZUjZbuQB/QukYIpLEI+ERQmG7FteSoUk9y08TLNSC6qmQCWSZmJCOBhy FjbSf4mrJQjn/wZik/hUOCESuLC+KZ6erpykr9tsQyjWAjnf1Py01NvZeYYblAH0pZ0b fIZQ== X-Forwarded-Encrypted: i=1; AJvYcCVcPn2Jh9qwxoaCGP4x/BHRbxzJVjHWgUTPBKYYom/Fg9kjHt04IoRX7fIQEKmkSrostJB1rZg0KIQ=@lists.freedesktop.org, AJvYcCWWKgG2w19tIqeXmD7SIcxsUK5TRjGS++RpoPXxbefL+xFNKbPl5gINx9k0o93i/gnQ3vt5rqEhrg==@lists.freedesktop.org X-Gm-Message-State: AOJu0Yy1RIG7WuTsdCZcVoWGqt3nQ189w6UgxhGYuEF5iHgQYsa5GRIT NmDOPLivaz4cTxhvYYobXj+lIS6s9e9xTlKz3URg20Hv18gCxMRmYwcU X-Gm-Gg: ASbGncvjaQHjiPL5O6POs1YZsWbInwgodWFTxNHQxmPRDFLgtVaRfgrrMZXde72DreI zKMKIiqNag3m0bfjfoQSMbWYaJ7CshNSsTJcfjg4YmfThk5bk/VXLsFRMm+52My5aXTvVD0Mg36 mOyBmjCZEq7o4c0tgJVEQamguAGDkUXKa5RLOuc6PVPjUDM3+rJJooHPRqQEmi0XHTn7LvmVWI+ sM/lSh71CdArNsC7ScfwjSPSMb78erC0g/y20FCxfRqlT+JfQfgbFVdooaNRFfQFYboXwQ9cPsq fqyt3+OA58VC6X71qMyaIE4zAH9+RulwpyQoGN9mIT3C1et3r2xAYE95pbEarKY7awunJ8OPdOe 2AwmyR/g3htETT0yASKk1eaykbbx5ikfRCeHZ3a3MufG0Q5wuK1fhaRYPlw== X-Google-Smtp-Source: AGHT+IFCEP/L3bXBqs/Es3rdbPAg2su8LejciUhcU1gz4fMvPZB8zY7ZN8+0SGHQrEiHpdqhCeVpUg== X-Received: by 2002:a05:6808:1689:b0:3f9:36ec:dab3 with SMTP id 5614622812f47-413ac356179mr2847725b6e.14.1752161495338; Thu, 10 Jul 2025 08:31:35 -0700 (PDT) Received: from 1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.ip6.arpa ([148.76.185.197]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-704979dbc3asm9449496d6.38.2025.07.10.08.31.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 10 Jul 2025 08:31:34 -0700 (PDT) From: Tamir Duberstein Date: Thu, 10 Jul 2025 11:31:04 -0400 Subject: [PATCH 01/17] 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: <20250710-core-cstr-cstrings-v1-1-027420ea799e@gmail.com> References: <20250710-core-cstr-cstrings-v1-0-027420ea799e@gmail.com> In-Reply-To: <20250710-core-cstr-cstrings-v1-0-027420ea799e@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 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, Tamir Duberstein X-Mailer: b4 0.15-dev X-Developer-Signature: v=1; a=openssh-sha256; t=1752161489; l=3319; i=tamird@gmail.com; h=from:subject:message-id; bh=SMbg/QZQA19CCgHGmkrUm3ENNSdod+XX5AR8EKjC0Ng=; b=U1NIU0lHAAAAAQAAADMAAAALc3NoLWVkMjU1MTkAAAAgtYz36g7iDMSkY5K7Ab51ksGX7hJgs MRt+XVZTrIzMVIAAAAGcGF0YXR0AAAAAAAAAAZzaGE1MTIAAABTAAAAC3NzaC1lZDI1NTE5AAAA QN3w5ONsQPO4V7WoDPlzbqmPUAfhN5mJcoMl5G7WybG2qCB9U5TBgYrxU4+N1jE5/MMqUyoMUTi 8t9YDb9Lcwws= X-Developer-Key: i=tamird@gmail.com; a=openssh; fpr=SHA256:264rPmnnrb+ERkS7DDS3tuwqcJss/zevJRzoylqMsbc X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" 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 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.50.0