Skip to content

Commit 2321842

Browse files
tamirdojeda
authored andcommitted
rust: drm: use core::ffi::CStr method names
Prepare for `core::ffi::CStr` taking the place of `kernel::str::CStr` by avoid methods that only exist on the latter. Link: #1075 Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Reviewed-by: Alice Ryhl <aliceryhl@google.com> Reviewed-by: Benno Lossin <lossin@kernel.org> Acked-by: Danilo Krummrich <dakr@kernel.org> Signed-off-by: Tamir Duberstein <tamird@gmail.com> Signed-off-by: Miguel Ojeda <ojeda@kernel.org>
1 parent 23cd58b commit 2321842

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

rust/kernel/drm/device.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,8 @@ impl<T: drm::Driver> Device<T> {
8282
major: T::INFO.major,
8383
minor: T::INFO.minor,
8484
patchlevel: T::INFO.patchlevel,
85-
name: T::INFO.name.as_char_ptr().cast_mut(),
86-
desc: T::INFO.desc.as_char_ptr().cast_mut(),
85+
name: crate::str::as_char_ptr_in_const_context(T::INFO.name).cast_mut(),
86+
desc: crate::str::as_char_ptr_in_const_context(T::INFO.desc).cast_mut(),
8787

8888
driver_features: drm::driver::FEAT_GEM,
8989
ioctls: T::IOCTLS.as_ptr(),

0 commit comments

Comments
 (0)