From f510c0ba042fb21032989c8c90e96a6aa61b84bf Mon Sep 17 00:00:00 2001
From: Liav A <liavalb@gmail.com>
Date: Fri, 2 Sep 2022 10:06:01 +0300
Subject: [PATCH] Kernel: Remove stale includes of x86 IO header file

The AHCI code doesn't rely on x86 IO at all as it only uses memory
mapped IO so we can simply remove the header.

We also simply don't use x86 IO in the Intel graphics driver, so we can
simply remove the include of the x86 IO header there too.

Everything else was a bunch of stale includes to the x86 IO header and
are actually not necessary, so let's remove them to make it easier to
compile non-x86 Kernel builds.
---
 Kernel/Bus/PCI/Controller/MemoryBackedHostBridge.cpp | 1 -
 Kernel/Bus/PCI/Controller/VolumeManagementDevice.cpp | 1 -
 Kernel/Bus/USB/USBHub.cpp                            | 1 -
 Kernel/Devices/HID/PS2KeyboardDevice.cpp             | 1 -
 Kernel/Devices/HID/PS2MouseDevice.cpp                | 1 -
 Kernel/Graphics/Bochs/GraphicsAdapter.cpp            | 1 -
 Kernel/Graphics/Console/VGATextModeConsole.cpp       | 1 -
 Kernel/Graphics/Generic/DisplayConnector.cpp         | 1 -
 Kernel/Graphics/Intel/NativeGraphicsAdapter.cpp      | 1 -
 Kernel/Graphics/VMWare/GraphicsAdapter.cpp           | 1 -
 Kernel/Storage/ATA/AHCI/InterruptHandler.h           | 1 -
 11 files changed, 11 deletions(-)

diff --git a/Kernel/Bus/PCI/Controller/MemoryBackedHostBridge.cpp b/Kernel/Bus/PCI/Controller/MemoryBackedHostBridge.cpp
index 8fd4a3c979e..c121e63ed3c 100644
--- a/Kernel/Bus/PCI/Controller/MemoryBackedHostBridge.cpp
+++ b/Kernel/Bus/PCI/Controller/MemoryBackedHostBridge.cpp
@@ -5,7 +5,6 @@
  */
 
 #include <AK/ByteReader.h>
-#include <Kernel/Arch/x86/IO.h>
 #include <Kernel/Bus/PCI/Access.h>
 #include <Kernel/Bus/PCI/Controller/MemoryBackedHostBridge.h>
 
diff --git a/Kernel/Bus/PCI/Controller/VolumeManagementDevice.cpp b/Kernel/Bus/PCI/Controller/VolumeManagementDevice.cpp
index cc42df31482..4c8d4d7be7e 100644
--- a/Kernel/Bus/PCI/Controller/VolumeManagementDevice.cpp
+++ b/Kernel/Bus/PCI/Controller/VolumeManagementDevice.cpp
@@ -5,7 +5,6 @@
  */
 
 #include <AK/ByteReader.h>
-#include <Kernel/Arch/x86/IO.h>
 #include <Kernel/Bus/PCI/API.h>
 #include <Kernel/Bus/PCI/Access.h>
 #include <Kernel/Bus/PCI/Controller/VolumeManagementDevice.h>
diff --git a/Kernel/Bus/USB/USBHub.cpp b/Kernel/Bus/USB/USBHub.cpp
index c2df5b8f4c5..ba3aff0237d 100644
--- a/Kernel/Bus/USB/USBHub.cpp
+++ b/Kernel/Bus/USB/USBHub.cpp
@@ -5,7 +5,6 @@
  */
 
 #include <Kernel/Arch/Delay.h>
-#include <Kernel/Arch/x86/IO.h>
 #include <Kernel/Bus/USB/USBClasses.h>
 #include <Kernel/Bus/USB/USBController.h>
 #include <Kernel/Bus/USB/USBHub.h>
diff --git a/Kernel/Devices/HID/PS2KeyboardDevice.cpp b/Kernel/Devices/HID/PS2KeyboardDevice.cpp
index 3cac1c7a9bc..ba8a3a3b25d 100644
--- a/Kernel/Devices/HID/PS2KeyboardDevice.cpp
+++ b/Kernel/Devices/HID/PS2KeyboardDevice.cpp
@@ -6,7 +6,6 @@
  */
 
 #include <AK/Types.h>
-#include <Kernel/Arch/x86/IO.h>
 #include <Kernel/Debug.h>
 #include <Kernel/Devices/DeviceManagement.h>
 #include <Kernel/Devices/HID/HIDManagement.h>
diff --git a/Kernel/Devices/HID/PS2MouseDevice.cpp b/Kernel/Devices/HID/PS2MouseDevice.cpp
index 9b06c4fbf51..86f090ffea4 100644
--- a/Kernel/Devices/HID/PS2MouseDevice.cpp
+++ b/Kernel/Devices/HID/PS2MouseDevice.cpp
@@ -6,7 +6,6 @@
 
 #include <AK/Memory.h>
 #include <Kernel/Arch/x86/Hypervisor/VMWareBackdoor.h>
-#include <Kernel/Arch/x86/IO.h>
 #include <Kernel/Debug.h>
 #include <Kernel/Devices/DeviceManagement.h>
 #include <Kernel/Devices/HID/PS2MouseDevice.h>
diff --git a/Kernel/Graphics/Bochs/GraphicsAdapter.cpp b/Kernel/Graphics/Bochs/GraphicsAdapter.cpp
index 0a1d161a489..1ec83a933ee 100644
--- a/Kernel/Graphics/Bochs/GraphicsAdapter.cpp
+++ b/Kernel/Graphics/Bochs/GraphicsAdapter.cpp
@@ -7,7 +7,6 @@
 #include <AK/Atomic.h>
 #include <AK/Checked.h>
 #include <AK/Try.h>
-#include <Kernel/Arch/x86/IO.h>
 #include <Kernel/Bus/PCI/API.h>
 #include <Kernel/Bus/PCI/IDs.h>
 #include <Kernel/Debug.h>
diff --git a/Kernel/Graphics/Console/VGATextModeConsole.cpp b/Kernel/Graphics/Console/VGATextModeConsole.cpp
index f410f93ec88..c70ca7bfebc 100644
--- a/Kernel/Graphics/Console/VGATextModeConsole.cpp
+++ b/Kernel/Graphics/Console/VGATextModeConsole.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: BSD-2-Clause
  */
 
-#include <Kernel/Arch/x86/IO.h>
 #include <Kernel/Graphics/Console/VGATextModeConsole.h>
 #include <Kernel/Graphics/GraphicsManagement.h>
 #include <Kernel/Sections.h>
diff --git a/Kernel/Graphics/Generic/DisplayConnector.cpp b/Kernel/Graphics/Generic/DisplayConnector.cpp
index 299aedb7db7..40bbb54f215 100644
--- a/Kernel/Graphics/Generic/DisplayConnector.cpp
+++ b/Kernel/Graphics/Generic/DisplayConnector.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: BSD-2-Clause
  */
 
-#include <Kernel/Arch/x86/IO.h>
 #include <Kernel/Debug.h>
 #include <Kernel/Devices/DeviceManagement.h>
 #include <Kernel/Graphics/Console/ContiguousFramebufferConsole.h>
diff --git a/Kernel/Graphics/Intel/NativeGraphicsAdapter.cpp b/Kernel/Graphics/Intel/NativeGraphicsAdapter.cpp
index eb627a1f1d1..2e3ceff3671 100644
--- a/Kernel/Graphics/Intel/NativeGraphicsAdapter.cpp
+++ b/Kernel/Graphics/Intel/NativeGraphicsAdapter.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: BSD-2-Clause
  */
 
-#include <Kernel/Arch/x86/IO.h>
 #include <Kernel/Bus/PCI/API.h>
 #include <Kernel/Graphics/Console/ContiguousFramebufferConsole.h>
 #include <Kernel/Graphics/Definitions.h>
diff --git a/Kernel/Graphics/VMWare/GraphicsAdapter.cpp b/Kernel/Graphics/VMWare/GraphicsAdapter.cpp
index 2bec2ac4010..d13448bb0b7 100644
--- a/Kernel/Graphics/VMWare/GraphicsAdapter.cpp
+++ b/Kernel/Graphics/VMWare/GraphicsAdapter.cpp
@@ -7,7 +7,6 @@
 #include <AK/Atomic.h>
 #include <AK/Checked.h>
 #include <AK/Try.h>
-#include <Kernel/Arch/x86/IO.h>
 #include <Kernel/Bus/PCI/API.h>
 #include <Kernel/Bus/PCI/IDs.h>
 #include <Kernel/Debug.h>
diff --git a/Kernel/Storage/ATA/AHCI/InterruptHandler.h b/Kernel/Storage/ATA/AHCI/InterruptHandler.h
index d8896887325..1e425147b56 100644
--- a/Kernel/Storage/ATA/AHCI/InterruptHandler.h
+++ b/Kernel/Storage/ATA/AHCI/InterruptHandler.h
@@ -6,7 +6,6 @@
 
 #pragma once
 
-#include <Kernel/Arch/x86/IO.h>
 #include <Kernel/Devices/Device.h>
 #include <Kernel/Interrupts/IRQHandler.h>
 #include <Kernel/Library/LockRefPtr.h>