summaryrefslogtreecommitdiff
path: root/Kernel
diff options
context:
space:
mode:
authorConrad Pankoff <deoxxa@fknsrs.biz>2019-08-28 21:53:52 +1000
committerAndreas Kling <awesomekling@gmail.com>2019-08-29 06:25:06 +0200
commit13abb3e88bf849036cb06df6db571509c1d64fda (patch)
treee9d4a44ff28ccd72b2568e21d28e96d8c84b153f /Kernel
parent93c16590f184bf247b1434258d8675cff2b069f2 (diff)
downloadserenity-13abb3e88bf849036cb06df6db571509c1d64fda.zip
Kernel: Remove now-unused singleton methods from our network devices
Diffstat (limited to 'Kernel')
-rw-r--r--Kernel/Net/E1000NetworkAdapter.cpp8
-rw-r--r--Kernel/Net/E1000NetworkAdapter.h3
-rw-r--r--Kernel/Net/RTL8139NetworkAdapter.cpp8
-rw-r--r--Kernel/Net/RTL8139NetworkAdapter.h3
4 files changed, 0 insertions, 22 deletions
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);