From 13abb3e88bf849036cb06df6db571509c1d64fda Mon Sep 17 00:00:00 2001
From: Conrad Pankoff <deoxxa@fknsrs.biz>
Date: Wed, 28 Aug 2019 21:53:52 +1000
Subject: Kernel: Remove now-unused singleton methods from our network devices

---
 Kernel/Net/E1000NetworkAdapter.cpp   | 8 --------
 Kernel/Net/E1000NetworkAdapter.h     | 3 ---
 Kernel/Net/RTL8139NetworkAdapter.cpp | 8 --------
 Kernel/Net/RTL8139NetworkAdapter.h   | 3 ---
 4 files changed, 22 deletions(-)

(limited to 'Kernel')

diff --git a/Kernel/Net/E1000NetworkAdapter.cpp b/Kernel/Net/E1000NetworkAdapter.cpp
index 43bae8c074..d09003af6c 100644
--- a/Kernel/Net/E1000NetworkAdapter.cpp
+++ b/Kernel/Net/E1000NetworkAdapter.cpp
@@ -107,18 +107,10 @@ OwnPtr<E1000NetworkAdapter> E1000NetworkAdapter::autodetect()
     return make<E1000NetworkAdapter>(found_address, irq);
 }
 
-static E1000NetworkAdapter* s_the;
-E1000NetworkAdapter* E1000NetworkAdapter::the()
-{
-    return s_the;
-}
-
 E1000NetworkAdapter::E1000NetworkAdapter(PCI::Address pci_address, u8 irq)
     : IRQHandler(irq)
     , m_pci_address(pci_address)
 {
-    s_the = this;
-
     set_interface_name("e1k");
 
     kprintf("E1000: Found at PCI address %b:%b:%b\n", pci_address.bus(), pci_address.slot(), pci_address.function());
diff --git a/Kernel/Net/E1000NetworkAdapter.h b/Kernel/Net/E1000NetworkAdapter.h
index 1c74a995cd..4d51b80a93 100644
--- a/Kernel/Net/E1000NetworkAdapter.h
+++ b/Kernel/Net/E1000NetworkAdapter.h
@@ -4,13 +4,10 @@
 #include <Kernel/IRQHandler.h>
 #include <Kernel/Net/NetworkAdapter.h>
 #include <Kernel/PCI.h>
-#include <Kernel/VM/MemoryManager.h>
 
 class E1000NetworkAdapter final : public NetworkAdapter
     , public IRQHandler {
 public:
-    static E1000NetworkAdapter* the();
-
     static OwnPtr<E1000NetworkAdapter> autodetect();
 
     E1000NetworkAdapter(PCI::Address, u8 irq);
diff --git a/Kernel/Net/RTL8139NetworkAdapter.cpp b/Kernel/Net/RTL8139NetworkAdapter.cpp
index 84595ff944..3f904df28b 100644
--- a/Kernel/Net/RTL8139NetworkAdapter.cpp
+++ b/Kernel/Net/RTL8139NetworkAdapter.cpp
@@ -113,18 +113,10 @@ OwnPtr<RTL8139NetworkAdapter> RTL8139NetworkAdapter::autodetect()
     return make<RTL8139NetworkAdapter>(found_address, irq);
 }
 
-static RTL8139NetworkAdapter* s_the;
-RTL8139NetworkAdapter* RTL8139NetworkAdapter::the()
-{
-    return s_the;
-}
-
 RTL8139NetworkAdapter::RTL8139NetworkAdapter(PCI::Address pci_address, u8 irq)
     : IRQHandler(irq)
     , m_pci_address(pci_address)
 {
-    s_the = this;
-
     set_interface_name("rtl8139");
 
     kprintf("RTL8139: Found at PCI address %b:%b:%b\n", pci_address.bus(), pci_address.slot(), pci_address.function());
diff --git a/Kernel/Net/RTL8139NetworkAdapter.h b/Kernel/Net/RTL8139NetworkAdapter.h
index 1fbe33fe96..7724f18289 100644
--- a/Kernel/Net/RTL8139NetworkAdapter.h
+++ b/Kernel/Net/RTL8139NetworkAdapter.h
@@ -1,7 +1,6 @@
 #pragma once
 
 #include <AK/OwnPtr.h>
-#include <AK/RefPtr.h>
 #include <Kernel/IRQHandler.h>
 #include <Kernel/Net/NetworkAdapter.h>
 #include <Kernel/PCI.h>
@@ -11,8 +10,6 @@
 class RTL8139NetworkAdapter final : public NetworkAdapter
     , public IRQHandler {
 public:
-    static RTL8139NetworkAdapter* the();
-
     static OwnPtr<RTL8139NetworkAdapter> autodetect();
 
     RTL8139NetworkAdapter(PCI::Address, u8 irq);
-- 
cgit v1.2.3