disks: Cleanup names for sysfs API

Signed-off-by: Ikey Doherty <[email protected]>

Author: ikeycode

crates/disks/src/disk.rs

@@ -148,10 +148,10 @@ impl DiskInit for BasicDisk {
 
         Some(Self {
             name: name.to_owned(),
-            sectors: sysfs::sysfs_read(sysroot, &node, "size").unwrap_or(0),
+            sectors: sysfs::read(sysroot, &node, "size").unwrap_or(0),
             device: PathBuf::from(DEVFS_DIR).join(name),
-            model: sysfs::sysfs_read(sysroot, &node, "device/model"),
-            vendor: sysfs::sysfs_read(sysroot, &node, "device/vendor"),
+            model: sysfs::read(sysroot, &node, "device/model"),
+            vendor: sysfs::read(sysroot, &node, "device/vendor"),
             partitions,
         })
     }

crates/disks/src/partition.rs

@@ -5,7 +5,7 @@
 use std::fmt;
 use std::path::{Path, PathBuf};
 
-use crate::{sysfs::sysfs_read, DEVFS_DIR, SYSFS_DIR};
+use crate::{sysfs, DEVFS_DIR, SYSFS_DIR};
 
 /// Represents a partition on a disk device
 /// - Size in sectors
@@ -50,9 +50,9 @@ impl Partition {
     /// * `None` if partition doesn't exist or is invalid
     pub fn from_sysfs_path(sysroot: &Path, name: &str) -> Option<Self> {
         let node = sysroot.join(SYSFS_DIR).join(name);
-        let partition_no: u32 = sysfs_read(sysroot, &node, "partition")?;
-        let start = sysfs_read(sysroot, &node, "start")?;
-        let size = sysfs_read(sysroot, &node, "size")?;
+        let partition_no: u32 = sysfs::read(sysroot, &node, "partition")?;
+        let start = sysfs::read(sysroot, &node, "start")?;
+        let size = sysfs::read(sysroot, &node, "size")?;
         Some(Self {
             name: name.to_owned(),
             number: partition_no,

crates/disks/src/sysfs.rs

@@ -22,7 +22,7 @@ use std::{fs, path::Path, str::FromStr};
 /// # Type Parameters
 ///
 /// * `T` - Target type that implements FromStr for parsing the raw value
-pub(crate) fn sysfs_read<T>(sysroot: &Path, node: &Path, key: &str) -> Option<T>
+pub(crate) fn read<T>(sysroot: &Path, node: &Path, key: &str) -> Option<T>
 where
     T: FromStr,
 {