system/serenity
system/serenity
1
0
Fork 0
mirror of https://github.com/SerenityOS/serenity synced 2024-10-15 20:33:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Kernel/Storage: Remove StorageController reset and shutdown methods

Browse source 
We never used these virtual methods outside their own implementation,
so let's stop pretending that we should be able to utilize this for
unknown purpose.
This commit is contained in:
Liav A. 2024-03-01 13:36:36 +02:00 committed by Andrew Kaster
parent eadf2bf29f
commit b4c218168f
7 changed files with 3 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Kernel/Devices/Storage/AHCI/Controller.cpp
View file

@ -72,11 +72,6 @@ ErrorOr<void> AHCIController::reset()
return {};
}
ErrorOr<void> AHCIController::shutdown()
{
return Error::from_errno(ENOTIMPL);
}
size_t AHCIController::devices_count() const
{
SpinlockLocker locker(m_hba_control_lock);

4
Kernel/Devices/Storage/AHCI/Controller.h
View file

@ -31,8 +31,6 @@ public:
virtual StringView device_name() const override { return "AHCI"sv; }
virtual LockRefPtr<StorageDevice> device(u32 index) const override;
virtual ErrorOr<void> reset() override;
virtual ErrorOr<void> shutdown() override;
virtual size_t devices_count() const override;
virtual void complete_current_request(AsyncDeviceRequest::RequestResult) override;
@ -41,6 +39,8 @@ public:
void handle_interrupt_for_port(Badge<AHCIInterruptHandler>, u32 port_index) const;
private:
ErrorOr<void> reset();
void disable_global_interrupts() const;
void enable_global_interrupts() const;

5
Kernel/Devices/Storage/NVMe/NVMeController.cpp
View file

@ -303,11 +303,6 @@ ErrorOr<void> NVMeController::reset()
return {};
}
ErrorOr<void> NVMeController::shutdown()
{
return Error::from_errno(ENOTIMPL);
}
void NVMeController::complete_current_request([[maybe_unused]] AsyncDeviceRequest::RequestResult result)
{
VERIFY_NOT_REACHED();

3
Kernel/Devices/Storage/NVMe/NVMeController.h
View file

@ -31,8 +31,7 @@ public:
virtual StringView device_name() const override { return "NVMeController"sv; }
protected:
ErrorOr<void> reset() override;
ErrorOr<void> shutdown() override;
ErrorOr<void> reset();
void complete_current_request(AsyncDeviceRequest::RequestResult result) override;
public:

4
Kernel/Devices/Storage/SD/SDHostController.cpp
View file

@ -73,10 +73,6 @@ SDHostController::SDHostController()
{
}
ErrorOr<void> SDHostController::reset() { return ENOTIMPL; }
ErrorOr<void> SDHostController::shutdown() { return ENOTIMPL; }
void SDHostController::complete_current_request(AsyncDeviceRequest::RequestResult)
{
VERIFY_NOT_REACHED();

2
Kernel/Devices/Storage/SD/SDHostController.h
View file

@ -25,8 +25,6 @@ public:
virtual ~SDHostController() = default;
virtual LockRefPtr<StorageDevice> device(u32 index) const override { return index == 0 ? m_card : nullptr; }
virtual ErrorOr<void> reset() override;
virtual ErrorOr<void> shutdown() override;
virtual size_t devices_count() const override { return m_card ? 1 : 0; }
virtual void complete_current_request(AsyncDeviceRequest::RequestResult) override;

3
Kernel/Devices/Storage/StorageController.h
View file

@ -33,9 +33,6 @@ public:
u32 hardware_relative_controller_id() const { return m_hardware_relative_controller_id; }
protected:
virtual ErrorOr<void> reset() = 0;
virtual ErrorOr<void> shutdown() = 0;
virtual void complete_current_request(AsyncDeviceRequest::RequestResult) = 0;
explicit StorageController(u32 hardware_relative_controller_id);