Replacing all occurrences of `addr_of_mut!(place)` with `&raw mut place`. This will allow us to reduce macro complexity, and improve consistency with existing reference syntax as `&raw mut` is similar to `&mut` making it fit more naturally with other existing code. Suggested-by: Benno Lossin <benno.lossin@xxxxxxxxx> Link: https://github.com/Rust-for-Linux/linux/issues/1148 Signed-off-by: Antonio Hickey <contact@xxxxxxxxxxxxxxxxx> --- rust/kernel/pci.rs | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/rust/kernel/pci.rs b/rust/kernel/pci.rs index c97d6d470b28..4ad82f10a8b3 100644 --- a/rust/kernel/pci.rs +++ b/rust/kernel/pci.rs @@ -17,11 +17,7 @@ types::{ARef, ForeignOwnable, Opaque}, ThisModule, }; -use core::{ - marker::PhantomData, - ops::Deref, - ptr::{addr_of_mut, NonNull}, -}; +use core::{marker::PhantomData, ops::Deref, ptr::NonNull}; use kernel::prelude::*; /// An adapter for the registration of PCI drivers. @@ -459,7 +455,7 @@ impl AsRef<device::Device> for Device { fn as_ref(&self) -> &device::Device { // SAFETY: By the type invariant of `Self`, `self.as_raw()` is a pointer to a valid // `struct pci_dev`. - let dev = unsafe { addr_of_mut!((*self.as_raw()).dev) }; + let dev = unsafe { &raw mut (*self.as_raw()).dev }; // SAFETY: `dev` points to a valid `struct device`. unsafe { device::Device::as_ref(dev) } -- 2.48.1
