Commit 7bb02685 authored by John Hubbard's avatar John Hubbard Committed by Danilo Krummrich
Browse files

rust: pci: inline several tiny functions 



Several previous commits added Vendor and Class functionality. As part
of that, the new functions were inlined where appropriate. But that left
this file with inconsistent use of inlining. Fix that by inlining the
remaining items that should be.

Cc: Danilo Krummrich <dakr@kernel.org>
Cc: Elle Rhumsaa <elle@weathered-steel.dev>
Reviewed-by: default avatarAlexandre Courbot <acourbot@nvidia.com>
Signed-off-by: default avatarJohn Hubbard <jhubbard@nvidia.com>
Link: https://lore.kernel.org/r/20250829223632.144030-7-jhubbard@nvidia.com


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

rust/kernel/pci.rs

+5 −0
Original line number Diff line number Diff line
@@ -134,6 +134,7 @@ impl DeviceId { 
    /// Equivalent to C's `PCI_DEVICE` macro.

    ///

    /// Create a new `pci::DeviceId` from a vendor and device ID.

    #[inline]

    pub const fn from_id(vendor: Vendor, device: u32) -> Self {

        Self(bindings::pci_device_id {

            vendor: vendor.as_raw() as u32,
@@ -150,6 +151,7 @@ pub const fn from_id(vendor: Vendor, device: u32) -> Self { 
    /// Equivalent to C's `PCI_DEVICE_CLASS` macro.

    ///

    /// Create a new `pci::DeviceId` from a class number and mask.

    #[inline]

    pub const fn from_class(class: u32, class_mask: u32) -> Self {

        Self(bindings::pci_device_id {

            vendor: DeviceId::PCI_ANY_ID,
@@ -387,6 +389,7 @@ fn release(&self) { 
}



impl Bar {

    #[inline]

    fn index_is_valid(index: u32) -> bool {

        // A `struct pci_dev` owns an array of resources with at most `PCI_NUM_RESOURCES` entries.

        index < bindings::PCI_NUM_RESOURCES
@@ -409,6 +412,7 @@ fn deref(&self) -> &Self::Target { 
}



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

    #[inline]

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

        self.0.get()

    }
@@ -582,6 +586,7 @@ pub fn enable_device_mem(&self) -> Result { 
    }



    /// Enable bus-mastering for this device.

    #[inline]

    pub fn set_master(&self) {

        // SAFETY: `self.as_raw` is guaranteed to be a pointer to a valid `struct pci_dev`.

        unsafe { bindings::pci_set_master(self.as_raw()) };