Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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: Zhi Wang <zhiw@nvidia.com>
Link: https://patch.msgid.link/20251105120352.77603-1-dakr@kernel.org
Signed-off-by: Danilo Krummrich <dakr@kernel.org>
+48
-19
+27
-8
rust/kernel/pci.rs
+27
-8
rust/kernel/pci.rs
···
5
5
//! C header: [`include/linux/pci.h`](srctree/include/linux/pci.h)
6
6
7
7
use crate::{
8
-
bindings, container_of, device,
9
-
device_id::{RawDeviceId, RawDeviceIdIndex},
8
+
bindings,
9
+
container_of,
10
+
device,
11
+
device_id::{
12
+
RawDeviceId,
13
+
RawDeviceIdIndex, //
14
+
},
10
15
driver,
11
-
error::{from_result, to_result, Result},
16
+
error::{
17
+
from_result,
18
+
to_result, //
19
+
},
20
+
prelude::*,
12
21
str::CStr,
13
22
types::Opaque,
14
-
ThisModule,
23
+
ThisModule, //
15
24
};
16
25
use core::{
17
26
marker::PhantomData,
18
-
ptr::{addr_of_mut, NonNull},
27
+
ptr::{
28
+
addr_of_mut,
29
+
NonNull, //
30
+
},
19
31
};
20
-
use kernel::prelude::*;
21
32
22
33
mod id;
23
34
mod io;
24
35
mod irq;
25
36
26
-
pub use self::id::{Class, ClassMask, Vendor};
37
+
pub use self::id::{
38
+
Class,
39
+
ClassMask,
40
+
Vendor, //
41
+
};
27
42
pub use self::io::Bar;
28
-
pub use self::irq::{IrqType, IrqTypes, IrqVector};
43
+
pub use self::irq::{
44
+
IrqType,
45
+
IrqTypes,
46
+
IrqVector, //
47
+
};
29
48
30
49
/// An adapter for the registration of PCI drivers.
31
50
pub struct Adapter<T: Driver>(T);
+4
-1
rust/kernel/pci/id.rs
+4
-1
rust/kernel/pci/id.rs
+8
-5
rust/kernel/pci/io.rs
+8
-5
rust/kernel/pci/io.rs
···
4
4
5
5
use super::Device;
6
6
use crate::{
7
-
bindings, device,
7
+
bindings,
8
+
device,
8
9
devres::Devres,
9
-
io::{Io, IoRaw},
10
-
str::CStr,
11
-
sync::aref::ARef,
10
+
io::{
11
+
Io,
12
+
IoRaw, //
13
+
},
14
+
prelude::*,
15
+
sync::aref::ARef, //
12
16
};
13
17
use core::ops::Deref;
14
-
use kernel::prelude::*;
15
18
16
19
/// A PCI BAR to perform I/O-Operations on.
17
20
///
+9
-5
rust/kernel/pci/irq.rs
+9
-5
rust/kernel/pci/irq.rs
···
4
4
5
5
use super::Device;
6
6
use crate::{
7
-
bindings, device,
7
+
bindings,
8
+
device,
8
9
device::Bound,
9
10
devres,
10
-
error::{to_result, Result},
11
-
irq::{self, IrqRequest},
11
+
error::to_result,
12
+
irq::{
13
+
self,
14
+
IrqRequest, //
15
+
},
16
+
prelude::*,
12
17
str::CStr,
13
-
sync::aref::ARef,
18
+
sync::aref::ARef, //
14
19
};
15
20
use core::ops::RangeInclusive;
16
-
use kernel::prelude::*;
17
21
18
22
/// IRQ type flags for PCI interrupt allocation.
19
23
#[derive(Debug, Clone, Copy)]