Merge pull request torvalds#607 from wedsonaf/platform-rename

rust: rename `platdev` to `platform`.
danobi · Jan 4, 2022 · 73bd4bb · 73bd4bb
2 parents 4f082c4 + e7ad88e
commit 73bd4bb
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/drivers/char/hw_random/bcm2835_rng_rust.rs b/drivers/char/hw_random/bcm2835_rng_rust.rs
@@ -7,7 +7,7 @@
 
 use kernel::{
     c_str, file::File, file_operations::FileOperations, io_buffer::IoBufferWriter, miscdev,
-    of::ConstOfMatchTable, platdev, platdev::PlatformDriver, prelude::*,
+    of::ConstOfMatchTable, platform, platform::PlatformDriver, prelude::*,
 };
 
 module! {
@@ -54,7 +54,7 @@ impl PlatformDriver for RngDriver {
 }
 
 struct RngModule {
-    _pdev: Pin<Box<platdev::Registration>>,
+    _pdev: Pin<Box<platform::Registration>>,
 }
 
 impl KernelModule for RngModule {
@@ -63,7 +63,7 @@ impl KernelModule for RngModule {
             ConstOfMatchTable::new_const([c_str!("brcm,bcm2835-rng")]);
 
         let pdev =
-            platdev::Registration::new_pinned::<RngDriver>(name, Some(&OF_MATCH_TBL), module)?;
+            platform::Registration::new_pinned::<RngDriver>(name, Some(&OF_MATCH_TBL), module)?;
 
         Ok(RngModule { _pdev: pdev })
     }

diff --git a/rust/kernel/lib.rs b/rust/kernel/lib.rs
@@ -84,7 +84,7 @@ pub mod io_buffer;
 pub mod io_mem;
 pub mod iov_iter;
 pub mod of;
-pub mod platdev;
+pub mod platform;
 mod types;
 pub mod user_ptr;
 

diff --git a/rust/kernel/platdev.rs → rust/kernel/platform.rs b/rust/kernel/platdev.rs → rust/kernel/platform.rs