1 files changed, 7 insertions, 9 deletions

diff --git a/kernel/kapi/devices/driver.tests.cpp b/kernel/kapi/devices/driver.tests.cpp
index 560cc1bc..b935cc57 100644
--- a/kernel/kapi/devices/driver.tests.cpp
+++ b/kernel/kapi/devices/driver.tests.cpp
@@ -30,8 +30,6 @@ namespace
 
   struct controller_protocol : kapi::devices::bus_protocol
   {
-    constexpr auto static id = kapi::capabilities::facet_id{"stacking_test_controller_protocol"};
-
     auto enumerate(kapi::devices::bus &) -> void override {}
 
     [[nodiscard]] auto match(kapi::devices::device const & dev, kapi::devices::driver const & drv) const
@@ -51,14 +49,14 @@ namespace
   {
     using kapi::devices::bus::bus;
 
-    [[nodiscard]] auto query_facet(kapi::capabilities::facet_id id) -> void * override
+    [[nodiscard]] auto query_facet(kapi::capabilities::facet_id facet) -> void * override
     {
-      if (id == controller_protocol::id || id == kapi::devices::bus_protocol::id)
+      if (facet == kapi::devices::bus_protocol::id)
       {
-        return &controller_protocol_instance;
+        return static_cast<kapi::devices::bus_protocol *>(&controller_protocol_instance);
       }
 
-      return kapi::devices::bus::query_facet(id);
+      return kapi::devices::bus::query_facet(facet);
     }
   };
 
@@ -148,9 +146,9 @@ namespace
 
     [[nodiscard]] auto query_facet(kapi::capabilities::facet_id id) -> void * override
     {
-      if (id == leaf_protocol::id || id == kapi::devices::bus_protocol::id)
+      if (id == kapi::devices::bus_protocol::id)
       {
-        return &leaf_protocol_instance;
+        return static_cast<kapi::devices::bus_protocol *>(&leaf_protocol_instance);
       }
 
       return kapi::devices::bus::query_facet(id);
@@ -164,7 +162,7 @@ namespace
       auto self_as_bus = kstd::static_pointer_cast<kapi::devices::bus>(dev.shared_from_this());
       auto leaf = kstd::make_shared<leaf_bus>("stacking_test_leaf_bus");
       self_as_bus->add_child(leaf);
-      leaf->facet<leaf_protocol>()->enumerate(*leaf);
+      leaf->facet<kapi::devices::bus_protocol>()->enumerate(*leaf);
 
       return kstd::success();
     }