Commit d8407396 authored by Danilo Krummrich's avatar Danilo Krummrich
Browse files

rust: pci: use "kernel vertical" style for imports 

Convert all imports in the PCI Rust module to use "kernel vertical"
style.

With this subsequent patches neither introduce unrelated changes nor
leave an inconsistent import pattern.

While at it, drop unnecessary imports covered by prelude::*.

Link: https://docs.kernel.org/rust/coding-guidelines.html#imports


Reviewed-by: default avatarZhi Wang <zhiw@nvidia.com>
Link: https://patch.msgid.link/20251105120352.77603-1-dakr@kernel.org


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

rust/kernel/pci.rs

+27 −8
Original line number Diff line number Diff line
@@ -5,27 +5,46 @@ 
//! C header: [`include/linux/pci.h`](srctree/include/linux/pci.h)



use crate::{

    bindings, container_of, device,

    device_id::{RawDeviceId, RawDeviceIdIndex},

    bindings,

    container_of,

    device,

    device_id::{

        RawDeviceId,

        RawDeviceIdIndex, //

    },

    driver,

    error::{from_result, to_result, Result},

    error::{

        from_result,

        to_result, //

    },

    prelude::*,

    str::CStr,

    types::Opaque,

    ThisModule,

    ThisModule, //

};

use core::{

    marker::PhantomData,

    ptr::{addr_of_mut, NonNull},

    ptr::{

        addr_of_mut,

        NonNull, //

    },

};

use kernel::prelude::*;



mod id;

mod io;

mod irq;



pub use self::id::{Class, ClassMask, Vendor};

pub use self::id::{

    Class,

    ClassMask,

    Vendor, //

};

pub use self::io::Bar;

pub use self::irq::{IrqType, IrqTypes, IrqVector};

pub use self::irq::{

    IrqType,

    IrqTypes,

    IrqVector, //

};



/// An adapter for the registration of PCI drivers.

pub struct Adapter<T: Driver>(T);

rust/kernel/pci/id.rs

+4 −1
Original line number Diff line number Diff line
@@ -4,7 +4,10 @@ 
//!

//! This module contains PCI class codes, Vendor IDs, and supporting types.



use crate::{bindings, error::code::EINVAL, error::Error, prelude::*};

use crate::{

    bindings,

    prelude::*, //

};

use core::fmt;



/// PCI device class codes.

rust/kernel/pci/io.rs

+8 −5
Original line number Diff line number Diff line
@@ -4,14 +4,17 @@ 


use super::Device;

use crate::{

    bindings, device,

    bindings,

    device,

    devres::Devres,

    io::{Io, IoRaw},

    str::CStr,

    sync::aref::ARef,

    io::{

        Io,

        IoRaw, //

    },

    prelude::*,

    sync::aref::ARef, //

};

use core::ops::Deref;

use kernel::prelude::*;



/// A PCI BAR to perform I/O-Operations on.

///

rust/kernel/pci/irq.rs

+9 −5
Original line number Diff line number Diff line
@@ -4,16 +4,20 @@ 


use super::Device;

use crate::{

    bindings, device,

    bindings,

    device,

    device::Bound,

    devres,

    error::{to_result, Result},

    irq::{self, IrqRequest},

    error::to_result,

    irq::{

        self,

        IrqRequest, //

    },

    prelude::*,

    str::CStr,

    sync::aref::ARef,

    sync::aref::ARef, //

};

use core::ops::RangeInclusive;

use kernel::prelude::*;



/// IRQ type flags for PCI interrupt allocation.

#[derive(Debug, Clone, Copy)]