From 1e324d2228fd7dc5b3feddc84797bb7835aaa74e Mon Sep 17 00:00:00 2001
From: Yuke Peng <pykfirst@gmail.com>
Date: Fri, 25 Jul 2025 15:51:39 +0800
Subject: [PATCH] Fix import error in PCI component

---
 kernel/comps/pci/src/bus.rs               |  2 +-
 kernel/comps/pci/src/capability/mod.rs    |  3 ++-
 kernel/comps/pci/src/capability/msix.rs   | 12 ++++--------
 kernel/comps/pci/src/capability/vendor.rs |  7 +++----
 kernel/comps/pci/src/cfg_space.rs         | 11 ++++-------
 kernel/comps/pci/src/common_device.rs     |  4 +++-
 6 files changed, 17 insertions(+), 22 deletions(-)

diff --git a/kernel/comps/pci/src/bus.rs b/kernel/comps/pci/src/bus.rs
index ffdbf6aa3..87dbcdab2 100644
--- a/kernel/comps/pci/src/bus.rs
+++ b/kernel/comps/pci/src/bus.rs
@@ -8,9 +8,9 @@ use alloc::{collections::VecDeque, sync::Arc, vec::Vec};
 use core::fmt::Debug;
 
 use log::{debug, error};
+use ostd::bus::BusProbeError;
 
 use super::{device_info::PciDeviceId, PciCommonDevice};
-use crate::bus::BusProbeError;
 
 /// PciDevice trait.
 pub trait PciDevice: Sync + Send + Debug {
diff --git a/kernel/comps/pci/src/capability/mod.rs b/kernel/comps/pci/src/capability/mod.rs
index a6f929a42..93d549d0b 100644
--- a/kernel/comps/pci/src/capability/mod.rs
+++ b/kernel/comps/pci/src/capability/mod.rs
@@ -6,11 +6,12 @@
 
 use alloc::vec::Vec;
 
+use ostd::bus::pci::PciDeviceLocation;
+
 use self::{msix::CapabilityMsixData, vendor::CapabilityVndrData};
 use super::{
     cfg_space::{PciDeviceCommonCfgOffset, Status},
     common_device::PciCommonDevice,
-    PciDeviceLocation,
 };
 
 pub mod msix;
diff --git a/kernel/comps/pci/src/capability/msix.rs b/kernel/comps/pci/src/capability/msix.rs
index 257c8d667..7a671a92d 100644
--- a/kernel/comps/pci/src/capability/msix.rs
+++ b/kernel/comps/pci/src/capability/msix.rs
@@ -7,15 +7,11 @@
 
 use alloc::{sync::Arc, vec::Vec};
 
+use ostd::{bus::pci::PciDeviceLocation, irq::IrqLine, mm::VmIoOnce};
+
 use crate::{
-    arch::pci::{construct_remappable_msix_address, MSIX_DEFAULT_MSG_ADDR},
-    bus::pci::{
-        cfg_space::{Bar, Command, MemoryBar},
-        common_device::PciCommonDevice,
-        device_info::PciDeviceLocation,
-    },
-    irq::IrqLine,
-    mm::VmIoOnce,
+    cfg_space::{Bar, Command, MemoryBar},
+    common_device::PciCommonDevice,
 };
 
 /// MSI-X capability. It will set the BAR space it uses to be hidden.
diff --git a/kernel/comps/pci/src/capability/vendor.rs b/kernel/comps/pci/src/capability/vendor.rs
index 16c6e66c4..1ed0823eb 100644
--- a/kernel/comps/pci/src/capability/vendor.rs
+++ b/kernel/comps/pci/src/capability/vendor.rs
@@ -2,10 +2,9 @@
 
 //! Vendor-specific capability support.
 
-use crate::{
-    bus::pci::{common_device::PciCommonDevice, device_info::PciDeviceLocation},
-    Error, Result,
-};
+use ostd::{bus::pci::PciDeviceLocation, Error, Result};
+
+use crate::common_device::PciCommonDevice;
 
 /// Vendor specific capability. Users can access this capability area at will,
 /// except for the PCI configuration space which cannot be accessed at will through this structure.
diff --git a/kernel/comps/pci/src/cfg_space.rs b/kernel/comps/pci/src/cfg_space.rs
index 160d415a4..61b1ff32c 100644
--- a/kernel/comps/pci/src/cfg_space.rs
+++ b/kernel/comps/pci/src/cfg_space.rs
@@ -7,18 +7,15 @@
 use alloc::sync::Arc;
 
 use bitflags::bitflags;
-
-use super::PciDeviceLocation;
-use crate::{
+use ostd::{
     arch::device::io_port::{PortRead, PortWrite},
     io::IoMem,
-    mm::{
-        page_prop::{CachePolicy, PageFlags},
-        PodOnce, VmIoOnce,
-    },
+    mm::{PodOnce, VmIoOnce},
     Error, Result,
 };
 
+use super::PciDeviceLocation;
+
 /// Offset in PCI device's common configuration space(Not the PCI bridge).
 #[repr(u16)]
 pub enum PciDeviceCommonCfgOffset {
diff --git a/kernel/comps/pci/src/common_device.rs b/kernel/comps/pci/src/common_device.rs
index 41087081f..a32017460 100644
--- a/kernel/comps/pci/src/common_device.rs
+++ b/kernel/comps/pci/src/common_device.rs
@@ -6,10 +6,12 @@
 
 use alloc::vec::Vec;
 
+use ostd::bus::pci::PciDeviceLocation;
+
 use super::{
     capability::Capability,
     cfg_space::{AddrLen, Bar, Command, PciDeviceCommonCfgOffset, Status},
-    device_info::{PciDeviceId, PciDeviceLocation},
+    device_info::PciDeviceId,
 };
 
 /// PCI common device, Contains a range of information and functions common to PCI devices.