diff --git a/drivers/audio/ac97d/src/main.rs b/drivers/audio/ac97d/src/main.rs index 4c4f6d8ec4..fdcf015795 100644 --- a/drivers/audio/ac97d/src/main.rs +++ b/drivers/audio/ac97d/src/main.rs @@ -20,7 +20,6 @@ use std::cell::RefCell; pub mod device; fn main() { - common::init(); pcid_interface::pci_daemon(daemon); } diff --git a/drivers/audio/ihdad/src/main.rs b/drivers/audio/ihdad/src/main.rs index 025aa58875..f762fb454c 100755 --- a/drivers/audio/ihdad/src/main.rs +++ b/drivers/audio/ihdad/src/main.rs @@ -25,7 +25,6 @@ QEMU ICH9 8086:293E */ fn main() { - common::init(); pcid_interface::pci_daemon(daemon); } diff --git a/drivers/graphics/bgad/src/main.rs b/drivers/graphics/bgad/src/main.rs index e939f3c66d..323ac2308f 100644 --- a/drivers/graphics/bgad/src/main.rs +++ b/drivers/graphics/bgad/src/main.rs @@ -14,7 +14,6 @@ mod scheme; // FIXME add a driver-graphics implementation fn main() { - common::init(); pcid_interface::pci_daemon(daemon); } diff --git a/drivers/graphics/ihdgd/src/main.rs b/drivers/graphics/ihdgd/src/main.rs index 60f093dcf3..657d3dffb3 100644 --- a/drivers/graphics/ihdgd/src/main.rs +++ b/drivers/graphics/ihdgd/src/main.rs @@ -11,7 +11,6 @@ mod device; use self::device::Device; fn main() { - common::init(); pcid_interface::pci_daemon(daemon); } diff --git a/drivers/graphics/virtio-gpud/src/main.rs b/drivers/graphics/virtio-gpud/src/main.rs index f46a17a3ba..0c8927903c 100644 --- a/drivers/graphics/virtio-gpud/src/main.rs +++ b/drivers/graphics/virtio-gpud/src/main.rs @@ -476,7 +476,6 @@ impl MoveCursor { static DEVICE: spin::Once = spin::Once::new(); fn main() { - common::init(); pcid_interface::pci_daemon(daemon_runner); } diff --git a/drivers/net/e1000d/src/main.rs b/drivers/net/e1000d/src/main.rs index a70d3904ed..373ea9b38b 100644 --- a/drivers/net/e1000d/src/main.rs +++ b/drivers/net/e1000d/src/main.rs @@ -8,7 +8,6 @@ use pcid_interface::PciFunctionHandle; pub mod device; fn main() { - common::init(); pcid_interface::pci_daemon(daemon); } diff --git a/drivers/net/ixgbed/src/main.rs b/drivers/net/ixgbed/src/main.rs index 7dfcd114aa..4a6ce74dcd 100644 --- a/drivers/net/ixgbed/src/main.rs +++ b/drivers/net/ixgbed/src/main.rs @@ -10,7 +10,6 @@ pub mod device; mod ixgbe; fn main() { - common::init(); pcid_interface::pci_daemon(daemon); } diff --git a/drivers/net/rtl8139d/src/main.rs b/drivers/net/rtl8139d/src/main.rs index 66d5329770..d470e814df 100644 --- a/drivers/net/rtl8139d/src/main.rs +++ b/drivers/net/rtl8139d/src/main.rs @@ -36,7 +36,6 @@ fn map_bar(pcid_handle: &mut PciFunctionHandle) -> *mut u8 { } fn main() { - common::init(); pcid_interface::pci_daemon(daemon); } diff --git a/drivers/net/rtl8168d/src/main.rs b/drivers/net/rtl8168d/src/main.rs index 9fae9eed1b..1d9963a3ad 100644 --- a/drivers/net/rtl8168d/src/main.rs +++ b/drivers/net/rtl8168d/src/main.rs @@ -36,7 +36,6 @@ fn map_bar(pcid_handle: &mut PciFunctionHandle) -> *mut u8 { } fn main() { - common::init(); pcid_interface::pci_daemon(daemon); } diff --git a/drivers/net/virtio-netd/src/main.rs b/drivers/net/virtio-netd/src/main.rs index 833fd9e843..17d168efdf 100644 --- a/drivers/net/virtio-netd/src/main.rs +++ b/drivers/net/virtio-netd/src/main.rs @@ -27,7 +27,6 @@ static_assertions::const_assert_eq!(core::mem::size_of::(), 12); const MAX_BUFFER_LEN: usize = 65535; fn main() { - common::init(); pcid_interface::pci_daemon(daemon_runner); } diff --git a/drivers/pcid/src/driver_interface/mod.rs b/drivers/pcid/src/driver_interface/mod.rs index a41f9fc829..97538c3cf4 100644 --- a/drivers/pcid/src/driver_interface/mod.rs +++ b/drivers/pcid/src/driver_interface/mod.rs @@ -486,6 +486,7 @@ impl PciFunctionHandle { pub fn pci_daemon !>(f: F) -> ! { Daemon::new(|daemon| { + common::init(); let pcid_handle = PciFunctionHandle::connect_default(); f(daemon, pcid_handle) }) diff --git a/drivers/storage/ahcid/src/main.rs b/drivers/storage/ahcid/src/main.rs index 59aada4164..1f130a2974 100644 --- a/drivers/storage/ahcid/src/main.rs +++ b/drivers/storage/ahcid/src/main.rs @@ -14,7 +14,6 @@ use log::{error, info}; pub mod ahci; fn main() { - common::init(); pcid_interface::pci_daemon(daemon); } diff --git a/drivers/storage/ided/src/main.rs b/drivers/storage/ided/src/main.rs index 35860c62ac..4197217dcd 100644 --- a/drivers/storage/ided/src/main.rs +++ b/drivers/storage/ided/src/main.rs @@ -20,7 +20,6 @@ use crate::ide::{AtaCommand, AtaDisk, Channel}; pub mod ide; fn main() { - common::init(); pcid_interface::pci_daemon(daemon); } diff --git a/drivers/storage/nvmed/src/main.rs b/drivers/storage/nvmed/src/main.rs index a488f4bc46..beb1b68940 100644 --- a/drivers/storage/nvmed/src/main.rs +++ b/drivers/storage/nvmed/src/main.rs @@ -57,7 +57,6 @@ fn time_arm(time_handle: &mut File, secs: i64) -> io::Result<()> { } fn main() { - common::init(); pcid_interface::pci_daemon(daemon); } diff --git a/drivers/storage/virtio-blkd/src/main.rs b/drivers/storage/virtio-blkd/src/main.rs index ef703afa5c..d21236b377 100644 --- a/drivers/storage/virtio-blkd/src/main.rs +++ b/drivers/storage/virtio-blkd/src/main.rs @@ -99,7 +99,6 @@ pub struct BlockVirtRequest { const_assert_eq!(core::mem::size_of::(), 16); fn main() { - common::init(); pcid_interface::pci_daemon(daemon_runner); } diff --git a/drivers/usb/xhcid/src/main.rs b/drivers/usb/xhcid/src/main.rs index d480c479ac..5c9c3c6090 100644 --- a/drivers/usb/xhcid/src/main.rs +++ b/drivers/usb/xhcid/src/main.rs @@ -184,7 +184,6 @@ fn daemon_with_context_size( } fn main() { - common::init(); pcid_interface::pci_daemon(daemon); } diff --git a/drivers/vboxd/src/main.rs b/drivers/vboxd/src/main.rs index 05e5db0172..bcb9bb157d 100644 --- a/drivers/vboxd/src/main.rs +++ b/drivers/vboxd/src/main.rs @@ -190,7 +190,6 @@ impl VboxGuestInfo { } fn main() { - common::init(); pcid_interface::pci_daemon(daemon); }