From 79aaf6113a9eca042ccc6f656fac6c7c243c608b Mon Sep 17 00:00:00 2001 From: "marcel.braun" Date: Sat, 7 Mar 2026 13:46:24 +0100 Subject: Simplify device lookup in storage controllers by removing redundant major number --- kernel/devices/src/storage/ram_disk/ram_disk_controller.cpp | 5 ++--- kernel/devices/src/storage/storage_management.cpp | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) (limited to 'kernel/devices/src/storage') diff --git a/kernel/devices/src/storage/ram_disk/ram_disk_controller.cpp b/kernel/devices/src/storage/ram_disk/ram_disk_controller.cpp index 09f1c85..9f9537f 100644 --- a/kernel/devices/src/storage/ram_disk/ram_disk_controller.cpp +++ b/kernel/devices/src/storage/ram_disk/ram_disk_controller.cpp @@ -29,10 +29,9 @@ namespace devices::storage::ram_disk }); } - auto ram_disk_controller::device_by_major_minor(size_t major, size_t minor) -> block_device * + auto ram_disk_controller::device_by_minor(size_t minor) -> block_device * { - auto it = std::ranges::find_if( - m_devices, [major, minor](auto const & device) { return device.major() == major && device.minor() == minor; }); + auto it = std::ranges::find_if(m_devices, [minor](auto const & device) { return device.minor() == minor; }); if (it != m_devices.end()) { diff --git a/kernel/devices/src/storage/storage_management.cpp b/kernel/devices/src/storage/storage_management.cpp index 1530d7a..a5b6503 100644 --- a/kernel/devices/src/storage/storage_management.cpp +++ b/kernel/devices/src/storage/storage_management.cpp @@ -60,7 +60,7 @@ namespace devices::storage std::ranges::find_if(m_controllers, [&](auto const controller) { if (controller != nullptr && controller->major() == major) { - found = controller->device_by_major_minor(major, minor); + found = controller->device_by_minor(minor); return found != nullptr; } return false; -- cgit v1.2.3