diff options
| author | Alexandre Courbot <acourbot@nvidia.com> | 2026-02-17 05:45:55 +0300 |
|---|---|---|
| committer | Alexandre Courbot <acourbot@nvidia.com> | 2026-02-25 02:17:04 +0300 |
| commit | 4a49fe23e357b48845e31fe9c28a802c05458198 (patch) | |
| tree | d70215b44f2bd460c89da8cc8c9ddcffce3a38e4 | |
| parent | 8e10d462e66db8b4702a8bd40642b214599270ba (diff) | |
| download | linux-4a49fe23e357b48845e31fe9c28a802c05458198.tar.xz | |
gpu: nova-core: use core library's CStr instead of kernel one
The kernel's own CStr type has been replaced by the one in the core
library, and is now an alias to the latter. Change our imports to
directly reference the actual type.
Reviewed-by: Lyude Paul <lyude@redhat.com>
Reviewed-by: Gary Guo <gary@garyguo.net>
Reviewed-by: Danilo Krummrich <dakr@kernel.org>
Link: https://patch.msgid.link/20260217-nova-misc-v3-7-b4e2d45eafbc@nvidia.com
[acourbot@nvidia.com: remove unneeded imports reorganization in
firmware/gsp.rs]
Signed-off-by: Alexandre Courbot <acourbot@nvidia.com>
| -rw-r--r-- | drivers/gpu/nova-core/firmware.rs | 2 | ||||
| -rw-r--r-- | drivers/gpu/nova-core/nova_core.rs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/nova-core/firmware.rs b/drivers/gpu/nova-core/firmware.rs index 4f57a270e142..815e8000bf81 100644 --- a/drivers/gpu/nova-core/firmware.rs +++ b/drivers/gpu/nova-core/firmware.rs @@ -425,7 +425,7 @@ impl<const N: usize> ModInfoBuilder<N> { } pub(crate) const fn create( - module_name: &'static kernel::str::CStr, + module_name: &'static core::ffi::CStr, ) -> firmware::ModInfoBuilder<N> { let mut this = Self(firmware::ModInfoBuilder::new(module_name)); let mut i = 0; diff --git a/drivers/gpu/nova-core/nova_core.rs b/drivers/gpu/nova-core/nova_core.rs index c1121e7c64c5..b5caf1044697 100644 --- a/drivers/gpu/nova-core/nova_core.rs +++ b/drivers/gpu/nova-core/nova_core.rs @@ -18,7 +18,7 @@ mod regs; mod sbuffer; mod vbios; -pub(crate) const MODULE_NAME: &kernel::str::CStr = <LocalModule as kernel::ModuleMetadata>::NAME; +pub(crate) const MODULE_NAME: &core::ffi::CStr = <LocalModule as kernel::ModuleMetadata>::NAME; kernel::module_pci_driver! { type: driver::NovaCore, |