`UniqueRefGpuVm` currently names its shared and mutable data accessors `data_ref()` and `data()`, unlike `GpuVmBo::data(&self)` and standard Rust naming conventions. Thus, rename them to `data(&self)` and `data_mut(&mut self)` for consistency.
Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Alice Ryhl <[email protected]> --- rust/kernel/drm/gpuvm/mod.rs | 4 ++-- rust/kernel/drm/gpuvm/sm_ops.rs | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/rust/kernel/drm/gpuvm/mod.rs b/rust/kernel/drm/gpuvm/mod.rs index d9d43d719761..23e73da865fb 100644 --- a/rust/kernel/drm/gpuvm/mod.rs +++ b/rust/kernel/drm/gpuvm/mod.rs @@ -311,14 +311,14 @@ fn sm_step_remap<'op, 'ctx>( impl<T: DriverGpuVm> UniqueRefGpuVm<T> { /// Access the data owned by this `UniqueRefGpuVm` immutably. #[inline] - pub fn data_ref(&self) -> &T { + pub fn data(&self) -> &T { // SAFETY: By the type invariants we may access `data`. unsafe { &*self.0.data.get() } } /// Access the data owned by this `UniqueRefGpuVm` mutably. #[inline] - pub fn data(&mut self) -> &mut T { + pub fn data_mut(&mut self) -> &mut T { // SAFETY: By the type invariants we may access `data`. unsafe { &mut *self.0.data.get() } } diff --git a/rust/kernel/drm/gpuvm/sm_ops.rs b/rust/kernel/drm/gpuvm/sm_ops.rs index 742c151b2540..9f3fe7c954fb 100644 --- a/rust/kernel/drm/gpuvm/sm_ops.rs +++ b/rust/kernel/drm/gpuvm/sm_ops.rs @@ -381,7 +381,7 @@ impl<T: DriverGpuVm> GpuVm<T> { match p .sm_data .gpuvm - .data() + .data_mut() .sm_step_map(op, p.sm_data.user_context) { Ok(OpMapped { .. }) => 0, @@ -402,7 +402,7 @@ impl<T: DriverGpuVm> GpuVm<T> { op: unsafe { &(*op).__bindgen_anon_1.unmap }, _invariant: PhantomData, }; - match p.gpuvm.data().sm_step_unmap(op, p.user_context) { + match p.gpuvm.data_mut().sm_step_unmap(op, p.user_context) { Ok(OpUnmapped { .. }) => 0, Err(err) => err.to_errno(), } @@ -421,7 +421,7 @@ impl<T: DriverGpuVm> GpuVm<T> { op: unsafe { &(*op).__bindgen_anon_1.remap }, _invariant: PhantomData, }; - match p.gpuvm.data().sm_step_remap(op, p.user_context) { + match p.gpuvm.data_mut().sm_step_remap(op, p.user_context) { Ok(OpRemapped { .. }) => 0, Err(err) => err.to_errno(), } --- base-commit: e55a991e09e3b44f0b0d8206bb523dc57c086341 change-id: 20261119-gpuvm-data-rename-cf6e0e59f266 Best regards, -- Alice Ryhl <[email protected]>
