From 4597e980fe5d6073b437d1aebc5171089f31e225 Mon Sep 17 00:00:00 2001 From: Liav A Date: Sun, 23 Jan 2022 20:23:19 +0200 Subject: [PATCH] Kernel/Storage: Remove duplicate private declaration in NVMeQueue class Also, the override of handle_irq method can be private too. --- Kernel/Storage/NVMe/NVMeQueue.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Kernel/Storage/NVMe/NVMeQueue.h b/Kernel/Storage/NVMe/NVMeQueue.h index 07ebf8edb2..9140213c59 100644 --- a/Kernel/Storage/NVMe/NVMeQueue.h +++ b/Kernel/Storage/NVMe/NVMeQueue.h @@ -33,7 +33,6 @@ public: ErrorOr create(); explicit NVMeQueue(u16 qid, u8 irq, u32 q_depth, OwnPtr cq_dma_region, NonnullRefPtrVector cq_dma_page, OwnPtr sq_dma_region, NonnullRefPtrVector sq_dma_page, Memory::TypedMapping db_regs); bool is_admin_queue() { return m_admin_queue; }; - virtual bool handle_irq(const RegisterState&) override; void submit_sqe(NVMeSubmission&); u16 submit_sync_sqe(NVMeSubmission&); void read(AsyncBlockDeviceRequest& request, u16 nsid, u64 index, u32 count); @@ -42,6 +41,8 @@ public: void disable_interrupts() { disable_irq(); }; private: + virtual bool handle_irq(const RegisterState&) override; + bool cqe_available(); void update_cqe_head(); void complete_current_request(u16 status); @@ -55,7 +56,6 @@ private: m_db_regs->sq_tail = m_sq_tail; } -private: u16 m_qid {}; u8 m_cq_valid_phase { 1 }; u16 m_sq_tail {};