From aacf09cef4f630d06e2e4e1d206eaad90e0d22e2 Mon Sep 17 00:00:00 2001
From: bjorn3 <17426603+bjorn3@users.noreply.github.com>
Date: Fri, 7 Mar 2025 20:42:41 +0100
Subject: [PATCH] storage/driver-block: Remove id method from Disk trait

---
 storage/ahcid/src/ahci/disk_ata.rs   | 4 ----
 storage/ahcid/src/ahci/disk_atapi.rs | 4 ----
 storage/bcm2835-sdhcid/src/sd/mod.rs | 4 ----
 storage/driver-block/src/lib.rs      | 1 -
 storage/ided/src/ide.rs              | 4 ----
 5 files changed, 17 deletions(-)

diff --git a/storage/ahcid/src/ahci/disk_ata.rs b/storage/ahcid/src/ahci/disk_ata.rs
index 2dc2a1f190..d5173e2f9e 100644
--- a/storage/ahcid/src/ahci/disk_ata.rs
+++ b/storage/ahcid/src/ahci/disk_ata.rs
@@ -154,10 +154,6 @@ impl DiskATA {
 }
 
 impl Disk for DiskATA {
-    fn id(&self) -> usize {
-        self.id
-    }
-
     fn size(&mut self) -> u64 {
         self.size
     }
diff --git a/storage/ahcid/src/ahci/disk_atapi.rs b/storage/ahcid/src/ahci/disk_atapi.rs
index 29ae47996c..33b35f92b1 100644
--- a/storage/ahcid/src/ahci/disk_atapi.rs
+++ b/storage/ahcid/src/ahci/disk_atapi.rs
@@ -72,10 +72,6 @@ impl DiskATAPI {
 }
 
 impl Disk for DiskATAPI {
-    fn id(&self) -> usize {
-        self.id
-    }
-
     fn size(&mut self) -> u64 {
         match self.read_capacity() {
             Ok((blk_count, blk_size)) => (blk_count as u64) * (blk_size as u64),
diff --git a/storage/bcm2835-sdhcid/src/sd/mod.rs b/storage/bcm2835-sdhcid/src/sd/mod.rs
index 8c718ba105..b371833773 100644
--- a/storage/bcm2835-sdhcid/src/sd/mod.rs
+++ b/storage/bcm2835-sdhcid/src/sd/mod.rs
@@ -733,10 +733,6 @@ impl SdHostCtrl {
 }
 
 impl Disk for SdHostCtrl {
-    fn id(&self) -> usize {
-        0xdead_dead
-    }
-
     fn size(&mut self) -> u64 {
         //assert 512MiB
         self.size
diff --git a/storage/driver-block/src/lib.rs b/storage/driver-block/src/lib.rs
index 316478f61a..6b10c14b26 100644
--- a/storage/driver-block/src/lib.rs
+++ b/storage/driver-block/src/lib.rs
@@ -54,7 +54,6 @@ pub fn block_read(
 }
 
 pub trait Disk {
-    fn id(&self) -> usize;
     fn block_length(&mut self) -> syscall::error::Result<u32>;
     fn size(&mut self) -> u64;
 
diff --git a/storage/ided/src/ide.rs b/storage/ided/src/ide.rs
index ad2b771446..b03213a464 100644
--- a/storage/ided/src/ide.rs
+++ b/storage/ided/src/ide.rs
@@ -169,10 +169,6 @@ pub struct AtaDisk {
 }
 
 impl Disk for AtaDisk {
-    fn id(&self) -> usize {
-        self.chan_i << 1 | self.dev as usize
-    }
-
     fn size(&mut self) -> u64 {
         self.size
     }