From 532f2b644c1e0fb7ab02cb76ef51b0f2f0b0f22e Mon Sep 17 00:00:00 2001 From: Tim Ledbetter Date: Wed, 7 Feb 2024 20:40:34 +0000 Subject: [PATCH] Kernel: Propagate errors with `TRY()` where possible --- Kernel/Bus/VirtIO/Device.cpp | 2 +- Kernel/Devices/Storage/ATA/AHCI/Controller.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Kernel/Bus/VirtIO/Device.cpp b/Kernel/Bus/VirtIO/Device.cpp index 4b75cce799..beb6e90ed3 100644 --- a/Kernel/Bus/VirtIO/Device.cpp +++ b/Kernel/Bus/VirtIO/Device.cpp @@ -92,7 +92,7 @@ ErrorOr Device::setup_queues(u16 requested_queue_count) VERIFY(!m_did_setup_queues); m_did_setup_queues = true; - auto* common_cfg = m_transport_entity->get_config(ConfigurationType::Common).release_value_but_fixme_should_propagate_errors(); + auto* common_cfg = TRY(m_transport_entity->get_config(ConfigurationType::Common)); if (common_cfg) { auto maximum_queue_count = m_transport_entity->config_read16(*common_cfg, COMMON_CFG_NUM_QUEUES); if (requested_queue_count == 0) { diff --git a/Kernel/Devices/Storage/ATA/AHCI/Controller.cpp b/Kernel/Devices/Storage/ATA/AHCI/Controller.cpp index 4345eb65b2..0b8a971946 100644 --- a/Kernel/Devices/Storage/ATA/AHCI/Controller.cpp +++ b/Kernel/Devices/Storage/ATA/AHCI/Controller.cpp @@ -64,7 +64,7 @@ ErrorOr AHCIController::reset() auto implemented_ports = AHCI::MaskedBitField((u32 volatile&)(hba().control_regs.pi)); for (auto index : implemented_ports.to_vector()) { - auto port = AHCIPort::create(*this, m_hba_capabilities, static_cast(hba().port_regs[index]), index).release_value_but_fixme_should_propagate_errors(); + auto port = TRY(AHCIPort::create(*this, m_hba_capabilities, static_cast(hba().port_regs[index]), index)); m_ports[index] = port; port->reset(); } @@ -174,7 +174,7 @@ UNMAP_AFTER_INIT ErrorOr AHCIController::initialize_hba(PCI::DeviceIdentif enable_global_interrupts(); auto implemented_ports = AHCI::MaskedBitField((u32 volatile&)(hba().control_regs.pi)); - m_irq_handler = AHCIInterruptHandler::create(*this, irq, implemented_ports).release_value_but_fixme_should_propagate_errors(); + m_irq_handler = TRY(AHCIInterruptHandler::create(*this, irq, implemented_ports)); TRY(reset()); dbgln_if(AHCI_DEBUG, "{}: AHCI Controller Version = {:#08x}", device_identifier().address(), version);