Skip to content

Commit fe66496

Browse files
supercomputer7awesomekling
authored andcommitted
Kernel: Change get_sharing_devices_count() in GenericInterruptHandler
The new method' name is sharing_devices_count(). The Serenity Coding Style tends to not accept the word "get" in methods' names if possible.
1 parent a7d7c0e commit fe66496

File tree

7 files changed

+8
-8
lines changed

7 files changed

+8
-8
lines changed

Kernel/Arch/i386/CPU.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -438,7 +438,7 @@ void register_generic_interrupt_handler(u8 interrupt_number, GenericInterruptHan
438438
ASSERT(s_interrupt_handler[interrupt_number]->purpose() == HandlerPurpose::SharedIRQHandler);
439439
static_cast<SharedIRQHandler*>(s_interrupt_handler[interrupt_number])->register_handler(handler);
440440
return;
441-
}
441+
}
442442
if (!s_interrupt_handler[interrupt_number]->is_shared_handler()) {
443443
ASSERT(s_interrupt_handler[interrupt_number]->purpose() == HandlerPurpose::IRQHandler);
444444
auto& previous_handler = *s_interrupt_handler[interrupt_number];
@@ -464,7 +464,7 @@ void unregister_generic_interrupt_handler(u8 interrupt_number, GenericInterruptH
464464
if (s_interrupt_handler[interrupt_number]->is_shared_handler() && !s_interrupt_handler[interrupt_number]->is_sharing_with_others()) {
465465
ASSERT(s_interrupt_handler[interrupt_number]->purpose() == HandlerPurpose::SharedIRQHandler);
466466
static_cast<SharedIRQHandler*>(s_interrupt_handler[interrupt_number])->unregister_handler(handler);
467-
if (!static_cast<SharedIRQHandler*>(s_interrupt_handler[interrupt_number])->get_sharing_devices_count()) {
467+
if (!static_cast<SharedIRQHandler*>(s_interrupt_handler[interrupt_number])->sharing_devices_count()) {
468468
revert_to_unused_handler(interrupt_number);
469469
}
470470
return;

Kernel/FileSystem/ProcFS.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -351,7 +351,7 @@ Optional<KBuffer> procfs$interrupts(InodeIdentifier)
351351
obj.add("purpose", "Interrupt Handler"); // FIXME: Determine the right description for each interrupt handler.
352352
obj.add("interrupt_line", handler.interrupt_number());
353353
obj.add("cpu_handler", 0); // FIXME: Determine the responsible CPU for each interrupt handler.
354-
obj.add("device_sharing", (unsigned)handler.get_sharing_devices_count());
354+
obj.add("device_sharing", (unsigned)handler.sharing_devices_count());
355355
obj.add("call_count", (unsigned)handler.get_invoking_count());
356356
});
357357
array.finish();

Kernel/Interrupts/GenericInterruptHandler.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ class GenericInterruptHandler {
5151

5252
size_t get_invoking_count() const { return m_invoking_count; }
5353

54-
virtual size_t get_sharing_devices_count() const = 0;
54+
virtual size_t sharing_devices_count() const = 0;
5555
virtual bool is_shared_handler() const = 0;
5656
virtual bool is_sharing_with_others() const = 0;
5757

Kernel/Interrupts/IRQHandler.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ class IRQHandler : public GenericInterruptHandler {
4747

4848
virtual HandlerPurpose purpose() const override { return HandlerPurpose::IRQHandler; }
4949

50-
virtual size_t get_sharing_devices_count() const override { return 0; }
50+
virtual size_t sharing_devices_count() const override { return 0; }
5151
virtual bool is_shared_handler() const override { return false; }
5252
virtual bool is_sharing_with_others() const override { return m_shared_with_others; }
5353

Kernel/Interrupts/MSIHandler.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ class MSIHandler : public GenericInterruptHandler {
4444

4545
virtual bool eoi() override;
4646

47-
virtual size_t get_sharing_devices_count() const override { return 0; }
47+
virtual size_t sharing_devices_count() const override { return 0; }
4848
virtual bool is_shared_handler() const override { return false; }
4949
virtual bool is_sharing_with_others() const override { return m_shared_with_others; }
5050

Kernel/Interrupts/SharedIRQHandler.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ class SharedIRQHandler final : public GenericInterruptHandler {
4545

4646
virtual bool eoi() override;
4747

48-
virtual size_t get_sharing_devices_count() const override { return m_handlers.size(); }
48+
virtual size_t sharing_devices_count() const override { return m_handlers.size(); }
4949
virtual bool is_shared_handler() const override { return true; }
5050
virtual bool is_sharing_with_others() const override { return false; }
5151

Kernel/Interrupts/UnhandledInterruptHandler.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ class UnhandledInterruptHandler final : public GenericInterruptHandler {
4343

4444
virtual HandlerPurpose purpose() const override { return HandlerPurpose::UnhandledInterruptHandler; }
4545

46-
virtual size_t get_sharing_devices_count() const override { return 0; }
46+
virtual size_t sharing_devices_count() const override { return 0; }
4747
virtual bool is_shared_handler() const override { return false; }
4848
virtual bool is_sharing_with_others() const override { return false; }
4949

0 commit comments

Comments
 (0)