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 3EB8CCCD187 for ; Mon, 6 Oct 2025 20:58:48 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 0418C10E672; Mon, 6 Oct 2025 20:58:06 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=permerror (0-bit key) header.d=gmail.com header.i=@gmail.com header.b="ZwubzoqZ"; dkim-atps=neutral Received: from mail-qt1-f174.google.com (mail-qt1-f174.google.com [209.85.160.174]) by gabe.freedesktop.org (Postfix) with ESMTPS id ED90210E76D; Wed, 13 Aug 2025 15:59:49 +0000 (UTC) Received: by mail-qt1-f174.google.com with SMTP id d75a77b69052e-4b1099126afso545931cf.0; Wed, 13 Aug 2025 08:59:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1755100789; x=1755705589; 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=/ZjL8BuYiXMAJDEbNeQ1u7fLpcTiw+Jir0VMSqwREoA=; b=ZwubzoqZDkPqYKAbWmvpWNXfxAyK/aQEt2bA/BBBjbuacXWzuUR0lABQlbPjyeN2A6 ngOB3m0V0RkwLq2JOIZol/APP8wNIqJljTNWM6l9nUl7DrKfZvqLXwnSqoy8zoxr3y6b bPPtPlxFveZuVeGi5LmlWTfA1Ayh3sIWbCbz+/XA87KL2iNurAD9awwN3pE3u4nmA6R7 xeQ5uqFPy44ibUUfW0wPQHe+N+9Hqa460gXfpkjjRStCXjPWRSXEqSMtfGG29HOxAI04 P+BUh8lof68//LkQat/Fp+fn6Ee6CREYyPUAllJGEvVRiyuNQSW4niPEu2ZBUdyd1qk5 WQaQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1755100789; x=1755705589; 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=/ZjL8BuYiXMAJDEbNeQ1u7fLpcTiw+Jir0VMSqwREoA=; b=VFpzN2Wlov1hzbciS80iWcLY8IsSLKvEdGdfFOZ1LFP5ENcdO/IzJzrKdvWb1y8chr xG6oAsXH8LEEmRsOYBjEbkxMaPUcdtRK0K77JByfJAMqovctizxz6io/DRUf2I8PLo92 Jwj4hrx9idN3Hql/J6aDzCwqDcJtGruCIDwUtblLeVoVHt2YXFlX57efdUgCG2zNr8Yz g+SjpGqpLLwO0nteK+/rBGsGE81ucfH0R3JuV0v5wxEJoaW5pKgkv2G1aP4S3/2YHfCO Uho7E2/7ilPfDOUxeJKWqCKD2lazglypMJ3XzEasi6vQNdjy00yABKJRrOd//MmRoQIR e1wg== X-Forwarded-Encrypted: i=1; AJvYcCUl5PmQIu7IzEDX/B+iEH3cpXIEa+pRscaTDrY7Q7k3a96yh68DWIbq5V2z1buPrVt6VJ0OV4A7va8=@lists.freedesktop.org, AJvYcCXPIl6RNTo22vPj1TtRKQK/eErwr3sxC2VzP7wrJbe/H7719dX19DqGeG63eYXtb4y11Eyh05PzjA==@lists.freedesktop.org X-Gm-Message-State: AOJu0YyQhBZNHbx7/P1mQX9NHDxMO37swiuoevH/F6MDwkmQpiBnsrMw QhZX5idoWdRAmRpaW3XEsLtP8eAv0n68JDLyN1sZp7KqpBZafoXivgHq X-Gm-Gg: ASbGncvYh8D7lIp9Uxmt1dmFLP5cvUdn41wCOqwBNrsKBqf8nTBNeajMWAPQS4dBKtt BiRvh+5WTU7gyUgsyv2vTPexQTfiMVKqGdYw513rkxqHx7f17m+5mxrFiPkCA34OklOyz8ncpbn YADLCI7Ov+emxhncP9nbpALSvk7tDfqQysiX2vxAuj+K2qkZfcpefUESXBovnXmIiBD4pTJhMeo j3k1whkTuQ56daduzcWM6EcwTIWKdpDelZinNYVjb7pcDVdPDDsHPV3iEMsIYMCkGoOapDP2oSk 81OBxtGE4n2nkJbIeOisxq0fq33bgIFBjG08l9sQVGeHpkKVu8nlQulwlEM1M5OnDyP1McVS4QW IHs2Ri/LZkInRa6dtaMBDOehxQUiAlx23LAxklpiuTd7ut7s7k+348hhkUmoGLxLIeNQIxB3Fpi N7qy8vuZMYn3y4za+iTKmDFWbJMNL7 X-Google-Smtp-Source: AGHT+IFFp6aIDI6QZQPb+JyapqaAj5uYDYsz9npJMS7fiT1IGSQMfKW1auc5xK12YIuMevr8ggZZCw== X-Received: by 2002:a05:622a:4d0a:b0:4b0:8f6e:d70f with SMTP id d75a77b69052e-4b0fc8208cemr46654731cf.43.1755100788813; Wed, 13 Aug 2025 08:59:48 -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 ([2600:4808:6353:5c00:d445:7694:2051:518c]) by smtp.gmail.com with ESMTPSA id d75a77b69052e-4b085ad7d08sm124482211cf.53.2025.08.13.08.59.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Aug 2025 08:59:48 -0700 (PDT) From: Tamir Duberstein Date: Wed, 13 Aug 2025 11:59:18 -0400 Subject: [PATCH v2 08/19] rust: firmware: replace `kernel::c_str!` with C-Strings MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20250813-core-cstr-cstrings-v2-8-00be80fc541b@gmail.com> References: <20250813-core-cstr-cstrings-v2-0-00be80fc541b@gmail.com> In-Reply-To: <20250813-core-cstr-cstrings-v2-0-00be80fc541b@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=1755100760; l=1629; i=tamird@gmail.com; h=from:subject:message-id; bh=UGSTQZC9H1LDaPmLjFq4B1ddEUZz53neJbsEkAPyHbw=; b=U1NIU0lHAAAAAQAAADMAAAALc3NoLWVkMjU1MTkAAAAgtYz36g7iDMSkY5K7Ab51ksGX7hJgs MRt+XVZTrIzMVIAAAAGcGF0YXR0AAAAAAAAAAZzaGE1MTIAAABTAAAAC3NzaC1lZDI1NTE5AAAA QG+vCCP6hDccm3sUoowPnpwpgqqFe3IfCMbA99v8SH1XNqg9hEr3E2kDwI1zkxYST/aT1F37NuR CZw/X51tLPQo= 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 Acked-by: Danilo Krummrich Signed-off-by: Tamir Duberstein --- rust/kernel/firmware.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/rust/kernel/firmware.rs b/rust/kernel/firmware.rs index 376e7e77453f..71168d8004e2 100644 --- a/rust/kernel/firmware.rs +++ b/rust/kernel/firmware.rs @@ -51,13 +51,13 @@ fn request_nowarn() -> Self { /// # Examples /// /// ```no_run -/// # use kernel::{c_str, device::Device, firmware::Firmware}; +/// # use kernel::{device::Device, firmware::Firmware}; /// /// # fn no_run() -> Result<(), Error> { /// # // SAFETY: *NOT* safe, just for the example to get an `ARef` instance /// # let dev = unsafe { Device::get_device(core::ptr::null_mut()) }; /// -/// let fw = Firmware::request(c_str!("path/to/firmware.bin"), &dev)?; +/// let fw = Firmware::request(c"path/to/firmware.bin", &dev)?; /// let blob = fw.data(); /// /// # Ok(()) @@ -204,7 +204,7 @@ macro_rules! module_firmware { ($($builder:tt)*) => { const _: () = { const __MODULE_FIRMWARE_PREFIX: &'static $crate::str::CStr = if cfg!(MODULE) { - $crate::c_str!("") + c"" } else { ::NAME }; -- 2.50.1