val213 5 months ago
parent
commit
7025b76ef9

+ 0 - 1
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<BTreeMap<String, Arc<ClassDir>>> = RwLock::new(BTreeMap::new());

+ 2 - 2
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},

+ 1 - 4
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,
     },

+ 1 - 4
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,
         },

+ 1 - 2
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,

+ 0 - 3
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 &[];
-    }
 }
 
 /// 初始化帧缓冲区子系统

+ 2 - 2
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,