Commit 3edaefbf authored by Danilo Krummrich's avatar Danilo Krummrich
Browse files

rust: pci: preserve device context in AsRef 



Since device::Device has a generic over its context, preserve this
device context in AsRef.

For instance, when calling pci::Device<Core> the new AsRef implementation
returns device::Device<Core>.

Reviewed-by: default avatarBenno Lossin <benno.lossin@proton.me>
Link: https://lore.kernel.org/r/20250413173758.12068-6-dakr@kernel.org


Signed-off-by: default avatarDanilo Krummrich <dakr@kernel.org>
parent da6c47c6

rust/kernel/pci.rs

+5 −3
Original line number Diff line number Diff line
@@ -360,11 +360,13 @@ fn deref(&self) -> &Self::Target { 
    }

}



impl Device {

impl<Ctx: device::DeviceContext> Device<Ctx> {

    fn as_raw(&self) -> *mut bindings::pci_dev {

        self.0.get()

    }

}



impl Device {

    /// Returns the PCI vendor ID.

    pub fn vendor_id(&self) -> u16 {

        // SAFETY: `self.as_raw` is a valid pointer to a `struct pci_dev`.
@@ -440,8 +442,8 @@ unsafe fn dec_ref(obj: NonNull<Self>) { 
    }

}



impl AsRef<device::Device> for Device {

    fn as_ref(&self) -> &device::Device {

impl<Ctx: device::DeviceContext> AsRef<device::Device<Ctx>> for Device<Ctx> {

    fn as_ref(&self) -> &device::Device<Ctx> {

        // 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) };