From f96e8e97e6470fe03393826f184737a918be0980 Mon Sep 17 00:00:00 2001 From: Liav A Date: Mon, 29 Nov 2021 22:10:40 +0200 Subject: [PATCH] Kernel/Storage: Remove redundant reference to a controller in IDEChannel IDEChannel which is an ATAPort derived class holded a NonnullRefPtr to a parent IDEController, although we can easily defer the usage of it to not be in the IDEChannel code at all, so it allows to keep NonnullRefPtr to the parent ATAController in the ATAPort base class and only there. --- Kernel/Storage/ATA/GenericIDE/Channel.cpp | 2 -- Kernel/Storage/ATA/GenericIDE/Channel.h | 1 - 2 files changed, 3 deletions(-) diff --git a/Kernel/Storage/ATA/GenericIDE/Channel.cpp b/Kernel/Storage/ATA/GenericIDE/Channel.cpp index cf5b6c349f..854e57e058 100644 --- a/Kernel/Storage/ATA/GenericIDE/Channel.cpp +++ b/Kernel/Storage/ATA/GenericIDE/Channel.cpp @@ -122,7 +122,6 @@ UNMAP_AFTER_INIT IDEChannel::IDEChannel(IDEController const& controller, u8 irq, , IRQHandler(irq) , m_channel_type(type) , m_io_group(io_group) - , m_parent_controller(controller) { } @@ -131,7 +130,6 @@ UNMAP_AFTER_INIT IDEChannel::IDEChannel(IDEController const& controller, IOAddre , IRQHandler(type == ChannelType::Primary ? PATA_PRIMARY_IRQ : PATA_SECONDARY_IRQ) , m_channel_type(type) , m_io_group(io_group) - , m_parent_controller(controller) { } diff --git a/Kernel/Storage/ATA/GenericIDE/Channel.h b/Kernel/Storage/ATA/GenericIDE/Channel.h index 59785d85f6..63b1538ebc 100644 --- a/Kernel/Storage/ATA/GenericIDE/Channel.h +++ b/Kernel/Storage/ATA/GenericIDE/Channel.h @@ -165,6 +165,5 @@ private: bool m_interrupts_enabled { true }; IOAddressGroup m_io_group; - NonnullRefPtr m_parent_controller; }; }