From f21145ca6852c4c7aaaf894b73893ffab0f76cd9 Mon Sep 17 00:00:00 2001
From: Bill Nguyen <bill.nguyen@unsw.edu.au>
Date: Tue, 6 Oct 2026 09:54:08 +1100
Subject: [PATCH] tool: remove bandaid patch for hotfix #605

Now that https://github.com/seL4/rust-sel4/pull/374 had been merged and
the rust-seL4 commit updated in #616.

Signed-off-by: Bill Nguyen <bill.nguyen@unsw.edu.au>
---
 tool/microkit/src/sdf/pci.rs | 26 +-------------------------
 1 file changed, 1 insertion(+), 25 deletions(-)

diff --git a/tool/microkit/src/sdf/pci.rs b/tool/microkit/src/sdf/pci.rs
index 423d3661e..7d153b852 100644
--- a/tool/microkit/src/sdf/pci.rs
+++ b/tool/microkit/src/sdf/pci.rs
@@ -4,7 +4,6 @@
 // SPDX-License-Identifier: BSD-2-Clause
 //
 
-use std::cmp::Ordering;
 use std::fmt;
 use std::ops::Deref;
 
@@ -12,7 +11,7 @@ use sel4_capdl_initializer_types::object;
 
 use super::util::ParseableAttribute;
 
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord)]
 pub struct PciDevice(pub object::PCIDevice);
 
 impl Deref for PciDevice {
@@ -23,29 +22,6 @@ impl Deref for PciDevice {
     }
 }
 
-// This should be removed once https://github.com/seL4/rust-sel4/pull/374 is merged
-impl Ord for PciDevice {
-    fn cmp(&self, other: &Self) -> Ordering {
-        let object::PCIDevice {
-            bus,
-            device,
-            function,
-        } = &self.0;
-        let object::PCIDevice {
-            bus: other_bus,
-            device: other_device,
-            function: other_function,
-        } = &other.0;
-        (bus, device, function).cmp(&(other_bus, other_device, other_function))
-    }
-}
-
-impl PartialOrd for PciDevice {
-    fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
-        Some(self.cmp(other))
-    }
-}
-
 impl From<PciDevice> for object::PCIDevice {
     fn from(device: PciDevice) -> Self {
         device.0