hle: kernel: Refactor several threads/events/sharedmemory to use slab heaps.

1 files changed, 2 insertions, 14 deletions

diff --git a/src/core/hle/kernel/slab_helpers.h b/src/core/hle/kernel/slab_helpers.h
index 4f23ddabf..66954b6b2 100644
--- a/src/core/hle/kernel/slab_helpers.h
+++ b/src/core/hle/kernel/slab_helpers.h
@@ -67,10 +67,6 @@ class KAutoObjectWithSlabHeapAndContainer : public Base {
 
 private:
     static Derived* Allocate(KernelCore& kernel) {
-        return kernel.SlabHeap<Derived>().Allocate();
-    }
-
-    static Derived* AllocateWithKernel(KernelCore& kernel) {
         return kernel.SlabHeap<Derived>().AllocateWithKernel(kernel);
     }
 
@@ -120,16 +116,8 @@ public:
         kernel.ObjectListContainer().Initialize();
     }
 
-    static Derived* Create() {
-        Derived* obj = Allocate();
-        if (obj != nullptr) {
-            KAutoObject::Create(obj);
-        }
-        return obj;
-    }
-
-    static Derived* CreateWithKernel(KernelCore& kernel) {
-        Derived* obj = AllocateWithKernel(kernel);
+    static Derived* Create(KernelCore& kernel) {
+        Derived* obj = Allocate(kernel);
         if (obj != nullptr) {
             KAutoObject::Create(obj);
         }