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 11F4ECCD186 for ; Mon, 6 Oct 2025 20:58:44 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 8241E10E666; Mon, 6 Oct 2025 20:58:05 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=permerror (0-bit key) header.d=gmail.com header.i=@gmail.com header.b="eGhABeQn"; dkim-atps=neutral Received: from mail-qt1-f177.google.com (mail-qt1-f177.google.com [209.85.160.177]) by gabe.freedesktop.org (Postfix) with ESMTPS id CF0B010E766; Wed, 13 Aug 2025 15:59:31 +0000 (UTC) Received: by mail-qt1-f177.google.com with SMTP id d75a77b69052e-4b109c6532fso210621cf.3; Wed, 13 Aug 2025 08:59:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1755100771; x=1755705571; 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=6EC+1oIHbj40bMk7XrURGYK12FsziAijPlq/Nwpia8Q=; b=eGhABeQnHaq6ZCm0RpXM2G7p4tVo/5QKc+UAnPYYtvQzDnA3K0nmdS66Moc2ZR+pmM fjwAwdpOq51u8ErfvdeY/WRxSsdnhlju2anZvbuV9JcQbD88kigefdSYt/LFNMBamGRv IgOxGynNMwEUGNFQ6GUIOgn8OBaz7+LNVwiMuayzn7LjFMHQvl8HQG9ZjUW8rdZmOqZh CXyKCSAn5Zml0LDl7N5+upZ4li2AkPr5VC+myk6LluDC5Iex44n3ZB3Eh/FGZmkyfTlb U7RhshoL0g2VOP4PwkxVvOZXlg/r9tctJkn/yjrm/XM1uONk+WSr+JgxZQ82h83a8+19 XBdw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1755100771; x=1755705571; 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=6EC+1oIHbj40bMk7XrURGYK12FsziAijPlq/Nwpia8Q=; b=FhYlffOsG+mU13tNsxWMcuoZm0zeajB3kTZmoaMfk9UxcUrxTTf3EgBO+Kp1zq66zC AXstE5ooUBCtmmyg8ETv26kuQLca/SxqFuuER8kGi191zHmC0By9EkVuXuFOkceoljO8 Fuxe0YoLvFE3KqVtYjEQmLSfRTXXmUzF8fsTt2O2FIUm2dA448YxCBFMGwcBHXquAIlU gNzNdNRizTxY9wuh9fdKsQhHr8c0vxwDhkpHyO55E/dfraVf4QyHVPqhtU7YSFDzpb+6 eV3NYKml9RWz8vD2UAlni5wLgoWVzbDTo30HZ4J7t/mvWP7iQMRP7osu85PTFdqu9G11 O2vA== X-Forwarded-Encrypted: i=1; AJvYcCUuUjhYxtBql/Lbbysf1DsNqCA2wHw3X9Py/ACzawVZRlQYE7CB+U2r2Pei+uOHkTCrElX0rZc6uw==@lists.freedesktop.org, AJvYcCUxmgsdSaeBoSSjRuSwsIAf1X/Im6fGO0E2PYL+ERbhePE99jEs6u6DPt15NLs/TczGgKxG0g17ImY=@lists.freedesktop.org X-Gm-Message-State: AOJu0YztXMjqD7bQ3Rys5+sGolPGp9CODE02Lgczypzl56urZ1FJaShn UFr1zHznE/AVn9JtxIqY27vp0GEfTaou446XvR4sSr7u2q6kuKfHkQer X-Gm-Gg: ASbGncskf/fjGira+4rGvzxjiq7/C9yBBNrmBoP6Z1Toume7tm3M8GxdRIN/i/MWVlC a9CkuKL53FepZ1zMkZhgP0XXNutUaEtuHoEfxB5fayKSgNwxm8302PjPbaKcJaFeFVytowIzS/A ViX20pQRedK7Sksoz/ozlOGIxfXmItypT+lXkMsVXzRr2Hd5usPzzkIRX/5dJqeVXVoAO1zmG5y +CrsryahvAgVg/UEfk0EphmgKkb/RW7dmOqblWTejisSsMSTZosR0OJEuvdwp4tzRglsVmg96Gv WjeSONtdyzlsGdu62ffyK3vk8UOyAbOZqz07Lstun9FzF5V+mjEkN3c5wizxgphrPoKmYQOMzFJ QIiVru29X31Cxrea2ZBKGbhWFOHIfAmLKuYMF1Hi//dhwczig5ecJFQzTFfEcQKYLc2MiH6SFGJ rrtBlW+2fpfHYLg0Lp6fI3SewqLoy91KqcgteOFF8UX1PJ4m6pnw== X-Google-Smtp-Source: AGHT+IGpgxrufvVbj/EAOSRbPajvrkbv1ubmtObGTneciR1xN69K//nK7cLM3mPNug8AvmxmRiJbtQ== X-Received: by 2002:a05:622a:1887:b0:4ab:3a31:680d with SMTP id d75a77b69052e-4b0fc71e9f9mr41676621cf.16.1755100770752; Wed, 13 Aug 2025 08:59:30 -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.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Aug 2025 08:59:30 -0700 (PDT) From: Tamir Duberstein Date: Wed, 13 Aug 2025 11:59:12 -0400 Subject: [PATCH v2 02/19] gpu: nova-core: 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-2-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=1755100759; l=2863; i=tamird@gmail.com; h=from:subject:message-id; bh=/6Rqc6yq70/uVo2CCK0rVzt/j/mmv1WXhqKkANquG+c=; b=U1NIU0lHAAAAAQAAADMAAAALc3NoLWVkMjU1MTkAAAAgtYz36g7iDMSkY5K7Ab51ksGX7hJgs MRt+XVZTrIzMVIAAAAGcGF0YXR0AAAAAAAAAAZzaGE1MTIAAABTAAAAC3NzaC1lZDI1NTE5AAAA QMxUD8q7sdXNIZJbqOsCnf0eKBOPnd2r+87E83qZIwccXLqO4VipK6rxEDA6qqdZDuVzG7p8Zpy 1WZEYV9IVxAE= 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 --- drivers/gpu/drm/nova/driver.rs | 10 +++++----- drivers/gpu/nova-core/driver.rs | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/gpu/drm/nova/driver.rs b/drivers/gpu/drm/nova/driver.rs index b28b2e05cc15..87480ee8dbae 100644 --- a/drivers/gpu/drm/nova/driver.rs +++ b/drivers/gpu/drm/nova/driver.rs @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0 -use kernel::{auxiliary, c_str, device::Core, drm, drm::gem, drm::ioctl, prelude::*, types::ARef}; +use kernel::{auxiliary, device::Core, drm, drm::gem, drm::ioctl, prelude::*, types::ARef}; use crate::file::File; use crate::gem::NovaObject; @@ -22,12 +22,12 @@ pub(crate) struct NovaData { major: 0, minor: 0, patchlevel: 0, - name: c_str!("nova"), - desc: c_str!("Nvidia Graphics"), + name: c"nova", + desc: c"Nvidia Graphics", }; -const NOVA_CORE_MODULE_NAME: &CStr = c_str!("NovaCore"); -const AUXILIARY_NAME: &CStr = c_str!("nova-drm"); +const NOVA_CORE_MODULE_NAME: &CStr = c"NovaCore"; +const AUXILIARY_NAME: &CStr = c"nova-drm"; kernel::auxiliary_device_table!( AUX_TABLE, diff --git a/drivers/gpu/nova-core/driver.rs b/drivers/gpu/nova-core/driver.rs index 274989ea1fb4..2f1a37be3107 100644 --- a/drivers/gpu/nova-core/driver.rs +++ b/drivers/gpu/nova-core/driver.rs @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0 -use kernel::{auxiliary, bindings, c_str, device::Core, pci, prelude::*, sizes::SZ_16M, sync::Arc}; +use kernel::{auxiliary, bindings, device::Core, pci, prelude::*, sizes::SZ_16M, sync::Arc}; use crate::gpu::Gpu; @@ -35,7 +35,7 @@ fn probe(pdev: &pci::Device, _info: &Self::IdInfo) -> Result(0, c_str!("nova-core/bar0")), + pdev.iomap_region_sized::(0, c"nova-core/bar0"), GFP_KERNEL, )?; @@ -44,7 +44,7 @@ fn probe(pdev: &pci::Device, _info: &Self::IdInfo) -> Result