diff options
| author | Brian Gianforcaro <bgianf@serenityos.org> | 2021-04-24 15:27:32 -0700 |
|---|---|---|
| committer | Andreas Kling <kling@serenityos.org> | 2021-04-25 09:38:27 +0200 |
| commit | 8d6e9fad40d493e6f2027cec37212956294a591f (patch) | |
| tree | 71816f325880a99ef5b623d9795f2eded3d69ca7 /Kernel/Storage/AHCIPort.cpp | |
| parent | 0d5827f8652462715f6c2f91e2b91b2077547ae6 (diff) | |
| download | serenity-8d6e9fad40d493e6f2027cec37212956294a591f.zip | |
Kernel: Remove the now defunct `LOCKER(..)` macro.
Diffstat (limited to 'Kernel/Storage/AHCIPort.cpp')
| -rw-r--r-- | Kernel/Storage/AHCIPort.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Kernel/Storage/AHCIPort.cpp b/Kernel/Storage/AHCIPort.cpp index 30e31a64c0..e6c9b8faa1 100644 --- a/Kernel/Storage/AHCIPort.cpp +++ b/Kernel/Storage/AHCIPort.cpp @@ -105,7 +105,7 @@ void AHCIPort::handle_interrupt() } else { g_io_work->queue([this]() { dbgln_if(AHCI_DEBUG, "AHCI Port {}: Request handled", representative_port_index()); - LOCKER(m_lock); + Locker locker(m_lock); VERIFY(m_current_request); VERIFY(m_current_scatter_list); if (m_current_request->request_type() == AsyncBlockDeviceRequest::Read) { @@ -133,7 +133,7 @@ bool AHCIPort::is_interrupts_enabled() const void AHCIPort::recover_from_fatal_error() { - LOCKER(m_lock); + Locker locker(m_lock); ScopedSpinLock lock(m_hard_lock); dmesgln("{}: AHCI Port {} fatal error, shutting down!", m_parent_handler->hba_controller()->pci_address(), representative_port_index()); dmesgln("{}: AHCI Port {} fatal error, SError {}", m_parent_handler->hba_controller()->pci_address(), representative_port_index(), (u32)m_port_registers.serr); @@ -217,7 +217,7 @@ void AHCIPort::eject() bool AHCIPort::reset() { - LOCKER(m_lock); + Locker locker(m_lock); ScopedSpinLock lock(m_hard_lock); dbgln_if(AHCI_DEBUG, "AHCI Port {}: Resetting", representative_port_index()); @@ -242,7 +242,7 @@ bool AHCIPort::reset() bool AHCIPort::initialize_without_reset() { - LOCKER(m_lock); + Locker locker(m_lock); ScopedSpinLock lock(m_hard_lock); dmesgln("AHCI Port {}: {}", representative_port_index(), try_disambiguate_sata_status()); return initialize(lock); @@ -454,7 +454,7 @@ Optional<AsyncDeviceRequest::RequestResult> AHCIPort::prepare_and_set_scatter_li void AHCIPort::start_request(AsyncBlockDeviceRequest& request) { - LOCKER(m_lock); + Locker locker(m_lock); dbgln_if(AHCI_DEBUG, "AHCI Port {}: Request start", representative_port_index()); VERIFY(!m_current_request); VERIFY(!m_current_scatter_list); @@ -657,7 +657,7 @@ bool AHCIPort::identify_device(ScopedSpinLock<SpinLock<u8>>& main_lock) bool AHCIPort::shutdown() { - LOCKER(m_lock); + Locker locker(m_lock); ScopedSpinLock lock(m_hard_lock); rebase(); set_interface_state(AHCI::DeviceDetectionInitialization::DisableInterface); |