Re: [PATCH] rust: pci: use "kernel vertical" style for imports

[Zhi Wang <zhiw@nvidia.com>]

On Wed,  5 Nov 2025 13:03:28 +0100
Danilo Krummrich <dakr@kernel.org> wrote:

> 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::*.
> 

Looking good to me and test on the driver-core-testing branch.

Reviewed-by: Zhi Wang <zhiw@nvidia.com>

> Link: https://docs.kernel.org/rust/coding-guidelines.html#imports
> Signed-off-by: Danilo Krummrich <dakr@kernel.org>
> ---
>  rust/kernel/pci.rs     | 35 +++++++++++++++++++++++++++--------
>  rust/kernel/pci/id.rs  |  5 ++++-
>  rust/kernel/pci/io.rs  | 13 ++++++++-----
>  rust/kernel/pci/irq.rs | 14 +++++++++-----
>  4 files changed, 48 insertions(+), 19 deletions(-)
> 
> diff --git a/rust/kernel/pci.rs b/rust/kernel/pci.rs
> index b68ef4e575fc..410b79d46632 100644
> --- a/rust/kernel/pci.rs
> +++ b/rust/kernel/pci.rs
> @@ -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);
> diff --git a/rust/kernel/pci/id.rs b/rust/kernel/pci/id.rs
> index 7f2a7f57507f..a1de70b2176a 100644
> --- a/rust/kernel/pci/id.rs
> +++ b/rust/kernel/pci/id.rs
> @@ -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.
> diff --git a/rust/kernel/pci/io.rs b/rust/kernel/pci/io.rs
> index 3684276b326b..0d55c3139b6f 100644
> --- a/rust/kernel/pci/io.rs
> +++ b/rust/kernel/pci/io.rs
> @@ -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.
>  ///
> diff --git a/rust/kernel/pci/irq.rs b/rust/kernel/pci/irq.rs
> index 782a524fe11c..063b6a5101ff 100644
> --- a/rust/kernel/pci/irq.rs
> +++ b/rust/kernel/pci/irq.rs
> @@ -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)]