diff --git a/Kernel/Arch/i386/CPU.cpp b/Kernel/Arch/i386/CPU.cpp index 7e8685f196a..807a8f1e78f 100644 --- a/Kernel/Arch/i386/CPU.cpp +++ b/Kernel/Arch/i386/CPU.cpp @@ -438,7 +438,7 @@ void register_generic_interrupt_handler(u8 interrupt_number, GenericInterruptHan ASSERT(s_interrupt_handler[interrupt_number]->purpose() == HandlerPurpose::SharedIRQHandler); static_cast(s_interrupt_handler[interrupt_number])->register_handler(handler); return; - } + } if (!s_interrupt_handler[interrupt_number]->is_shared_handler()) { ASSERT(s_interrupt_handler[interrupt_number]->purpose() == HandlerPurpose::IRQHandler); auto& previous_handler = *s_interrupt_handler[interrupt_number]; @@ -464,7 +464,7 @@ void unregister_generic_interrupt_handler(u8 interrupt_number, GenericInterruptH if (s_interrupt_handler[interrupt_number]->is_shared_handler() && !s_interrupt_handler[interrupt_number]->is_sharing_with_others()) { ASSERT(s_interrupt_handler[interrupt_number]->purpose() == HandlerPurpose::SharedIRQHandler); static_cast(s_interrupt_handler[interrupt_number])->unregister_handler(handler); - if (!static_cast(s_interrupt_handler[interrupt_number])->get_sharing_devices_count()) { + if (!static_cast(s_interrupt_handler[interrupt_number])->sharing_devices_count()) { revert_to_unused_handler(interrupt_number); } return; diff --git a/Kernel/FileSystem/ProcFS.cpp b/Kernel/FileSystem/ProcFS.cpp index 2bade10fb34..51fa57c9277 100644 --- a/Kernel/FileSystem/ProcFS.cpp +++ b/Kernel/FileSystem/ProcFS.cpp @@ -351,7 +351,7 @@ Optional procfs$interrupts(InodeIdentifier) obj.add("purpose", "Interrupt Handler"); // FIXME: Determine the right description for each interrupt handler. obj.add("interrupt_line", handler.interrupt_number()); obj.add("cpu_handler", 0); // FIXME: Determine the responsible CPU for each interrupt handler. - obj.add("device_sharing", (unsigned)handler.get_sharing_devices_count()); + obj.add("device_sharing", (unsigned)handler.sharing_devices_count()); obj.add("call_count", (unsigned)handler.get_invoking_count()); }); array.finish(); diff --git a/Kernel/Interrupts/GenericInterruptHandler.h b/Kernel/Interrupts/GenericInterruptHandler.h index 3b90830365e..8da9df7d862 100644 --- a/Kernel/Interrupts/GenericInterruptHandler.h +++ b/Kernel/Interrupts/GenericInterruptHandler.h @@ -51,7 +51,7 @@ public: size_t get_invoking_count() const { return m_invoking_count; } - virtual size_t get_sharing_devices_count() const = 0; + virtual size_t sharing_devices_count() const = 0; virtual bool is_shared_handler() const = 0; virtual bool is_sharing_with_others() const = 0; diff --git a/Kernel/Interrupts/IRQHandler.h b/Kernel/Interrupts/IRQHandler.h index 3584d651701..fe6c9b0d0f0 100644 --- a/Kernel/Interrupts/IRQHandler.h +++ b/Kernel/Interrupts/IRQHandler.h @@ -47,7 +47,7 @@ public: virtual HandlerPurpose purpose() const override { return HandlerPurpose::IRQHandler; } - virtual size_t get_sharing_devices_count() const override { return 0; } + virtual size_t sharing_devices_count() const override { return 0; } virtual bool is_shared_handler() const override { return false; } virtual bool is_sharing_with_others() const override { return m_shared_with_others; } diff --git a/Kernel/Interrupts/MSIHandler.h b/Kernel/Interrupts/MSIHandler.h index 2409e9b6a5d..73c08676f63 100644 --- a/Kernel/Interrupts/MSIHandler.h +++ b/Kernel/Interrupts/MSIHandler.h @@ -44,7 +44,7 @@ public: virtual bool eoi() override; - virtual size_t get_sharing_devices_count() const override { return 0; } + virtual size_t sharing_devices_count() const override { return 0; } virtual bool is_shared_handler() const override { return false; } virtual bool is_sharing_with_others() const override { return m_shared_with_others; } diff --git a/Kernel/Interrupts/SharedIRQHandler.h b/Kernel/Interrupts/SharedIRQHandler.h index c3a3e20dc11..a33be4c4a1b 100644 --- a/Kernel/Interrupts/SharedIRQHandler.h +++ b/Kernel/Interrupts/SharedIRQHandler.h @@ -45,7 +45,7 @@ public: virtual bool eoi() override; - virtual size_t get_sharing_devices_count() const override { return m_handlers.size(); } + virtual size_t sharing_devices_count() const override { return m_handlers.size(); } virtual bool is_shared_handler() const override { return true; } virtual bool is_sharing_with_others() const override { return false; } diff --git a/Kernel/Interrupts/UnhandledInterruptHandler.h b/Kernel/Interrupts/UnhandledInterruptHandler.h index dd1dd37e49c..10732cdc8f7 100644 --- a/Kernel/Interrupts/UnhandledInterruptHandler.h +++ b/Kernel/Interrupts/UnhandledInterruptHandler.h @@ -43,7 +43,7 @@ public: virtual HandlerPurpose purpose() const override { return HandlerPurpose::UnhandledInterruptHandler; } - virtual size_t get_sharing_devices_count() const override { return 0; } + virtual size_t sharing_devices_count() const override { return 0; } virtual bool is_shared_handler() const override { return false; } virtual bool is_sharing_with_others() const override { return false; }