diff --git a/kernel/src/driver/base/device/mod.rs b/kernel/src/driver/base/device/mod.rs index aa8cf2d6..108508c9 100644 --- a/kernel/src/driver/base/device/mod.rs +++ b/kernel/src/driver/base/device/mod.rs @@ -1025,7 +1025,6 @@ impl Eq for DeviceId {} impl IrqHandlerData for DeviceId {} - lazy_static! { /// class_dir列表,通过parent kobject的name和class_dir的name来索引class_dir实例 static ref CLASS_DIR_KSET_INSTANCE: RwLock>> = RwLock::new(BTreeMap::new()); diff --git a/kernel/src/driver/base/kset.rs b/kernel/src/driver/base/kset.rs index 80004caa..4d890d72 100644 --- a/kernel/src/driver/base/kset.rs +++ b/kernel/src/driver/base/kset.rs @@ -7,8 +7,8 @@ use alloc::{ use core::hash::Hash; use super::kobject::{ - DynamicKObjKType, KObjType, KObject, KObjectManager, KObjectState, LockedKObjectState, - }; + DynamicKObjKType, KObjType, KObject, KObjectManager, KObjectState, LockedKObjectState, +}; use crate::{ filesystem::kernfs::KernFSInode, libs::rwlock::{RwLock, RwLockReadGuard, RwLockWriteGuard}, diff --git a/kernel/src/driver/pci/raw_device.rs b/kernel/src/driver/pci/raw_device.rs index 542b611f..a93478c0 100644 --- a/kernel/src/driver/pci/raw_device.rs +++ b/kernel/src/driver/pci/raw_device.rs @@ -8,10 +8,7 @@ use alloc::{ use crate::{ driver::base::{ class::Class, - device::{ - bus::Bus, driver::Driver, Device, DeviceCommonData, DeviceType, - IdTable, - }, + device::{bus::Bus, driver::Driver, Device, DeviceCommonData, DeviceType, IdTable}, kobject::{KObjType, KObject, KObjectCommonData, KObjectState, LockedKObjectState}, kset::KSet, }, diff --git a/kernel/src/driver/pci/test/pt_device.rs b/kernel/src/driver/pci/test/pt_device.rs index ed51b89d..8c39d598 100644 --- a/kernel/src/driver/pci/test/pt_device.rs +++ b/kernel/src/driver/pci/test/pt_device.rs @@ -10,10 +10,7 @@ use crate::{ driver::{ base::{ class::Class, - device::{ - bus::Bus, driver::Driver, Device, DeviceCommonData, DeviceType, - IdTable, - }, + device::{bus::Bus, driver::Driver, Device, DeviceCommonData, DeviceType, IdTable}, kobject::{KObjType, KObject, KObjectCommonData, KObjectState, LockedKObjectState}, kset::KSet, }, diff --git a/kernel/src/driver/rtc/sysfs.rs b/kernel/src/driver/rtc/sysfs.rs index 9e8c5f4d..079967d0 100644 --- a/kernel/src/driver/rtc/sysfs.rs +++ b/kernel/src/driver/rtc/sysfs.rs @@ -9,8 +9,7 @@ use crate::{ driver::base::{ class::Class, device::{ - bus::Bus, device_manager, driver::Driver, Device, DeviceCommonData, - DeviceType, IdTable, + bus::Bus, device_manager, driver::Driver, Device, DeviceCommonData, DeviceType, IdTable, }, kobject::{KObjType, KObject, KObjectCommonData, KObjectState, LockedKObjectState}, kset::KSet, diff --git a/kernel/src/driver/tty/sysfs.rs b/kernel/src/driver/tty/sysfs.rs index 5a29f8d4..12d3a660 100644 --- a/kernel/src/driver/tty/sysfs.rs +++ b/kernel/src/driver/tty/sysfs.rs @@ -63,9 +63,6 @@ impl Class for TtyClass { return &self.subsystem; } - fn dev_groups(&self) -> &'static [&'static dyn AttributeGroup] { - return &[]; - } } /// 初始化帧缓冲区子系统 diff --git a/kernel/src/driver/video/fbdev/base/fbcon/mod.rs b/kernel/src/driver/video/fbdev/base/fbcon/mod.rs index 8cbaf7d7..3a5c6f9c 100644 --- a/kernel/src/driver/video/fbdev/base/fbcon/mod.rs +++ b/kernel/src/driver/video/fbdev/base/fbcon/mod.rs @@ -11,8 +11,8 @@ use crate::{ base::{ class::Class, device::{ - bus::Bus, device_manager, driver::Driver, Device, - DeviceCommonData, DeviceType, IdTable, + bus::Bus, device_manager, driver::Driver, Device, DeviceCommonData, DeviceType, + IdTable, }, kobject::{KObjType, KObject, KObjectCommonData, KObjectState, LockedKObjectState}, kset::KSet,