diff --git a/ArmPkg/Drivers/ArmGic/ArmGicLib.c b/ArmPkg/Drivers/ArmGic/ArmGicLib.c
index 5daca3fde7..206ad2e581 100644
--- a/ArmPkg/Drivers/ArmGic/ArmGicLib.c
+++ b/ArmPkg/Drivers/ArmGic/ArmGicLib.c
@@ -356,39 +356,3 @@ ArmGicDisableDistributor (
   // Disable Gic Distributor
   MmioWrite32 (GicDistributorBase + ARM_GIC_ICDDCR, 0x0);
 }
-
-VOID
-EFIAPI
-ArmGicEnableInterruptInterface (
-  IN  UINTN  GicInterruptInterfaceBase
-  )
-{
-  ARM_GIC_ARCH_REVISION  Revision;
-
-  Revision = ArmGicGetSupportedArchRevision ();
-  if (Revision == ARM_GIC_ARCH_REVISION_2) {
-    ArmGicV2EnableInterruptInterface (GicInterruptInterfaceBase);
-  } else if (Revision == ARM_GIC_ARCH_REVISION_3) {
-    ArmGicV3EnableInterruptInterface ();
-  } else {
-    ASSERT_EFI_ERROR (EFI_UNSUPPORTED);
-  }
-}
-
-VOID
-EFIAPI
-ArmGicDisableInterruptInterface (
-  IN  UINTN  GicInterruptInterfaceBase
-  )
-{
-  ARM_GIC_ARCH_REVISION  Revision;
-
-  Revision = ArmGicGetSupportedArchRevision ();
-  if (Revision == ARM_GIC_ARCH_REVISION_2) {
-    ArmGicV2DisableInterruptInterface (GicInterruptInterfaceBase);
-  } else if (Revision == ARM_GIC_ARCH_REVISION_3) {
-    ArmGicV3DisableInterruptInterface ();
-  } else {
-    ASSERT_EFI_ERROR (EFI_UNSUPPORTED);
-  }
-}
diff --git a/ArmPkg/Drivers/ArmGic/GicV2/ArmGicV2Dxe.c b/ArmPkg/Drivers/ArmGic/GicV2/ArmGicV2Dxe.c
index cd65cf06d7..ef48177ee5 100644
--- a/ArmPkg/Drivers/ArmGic/GicV2/ArmGicV2Dxe.c
+++ b/ArmPkg/Drivers/ArmGic/GicV2/ArmGicV2Dxe.c
@@ -451,7 +451,7 @@ GicV2DxeInitialize (
   MmioWrite32 (mGicInterruptInterfaceBase + ARM_GIC_ICCPMR, 0xff);
 
   // Enable gic cpu interface
-  ArmGicEnableInterruptInterface (mGicInterruptInterfaceBase);
+  ArmGicV2EnableInterruptInterface (mGicInterruptInterfaceBase);
 
   // Enable gic distributor
   ArmGicEnableDistributor (mGicDistributorBase);
diff --git a/ArmPkg/Include/Library/ArmGicLib.h b/ArmPkg/Include/Library/ArmGicLib.h
index 2874ea2b0b..32807c213b 100644
--- a/ArmPkg/Include/Library/ArmGicLib.h
+++ b/ArmPkg/Include/Library/ArmGicLib.h
@@ -133,18 +133,6 @@ ArmGicSetSecureInterrupts (
   IN  UINTN  GicSecureInterruptMaskSize
   );
 
-VOID
-EFIAPI
-ArmGicEnableInterruptInterface (
-  IN  UINTN  GicInterruptInterfaceBase
-  );
-
-VOID
-EFIAPI
-ArmGicDisableInterruptInterface (
-  IN  UINTN  GicInterruptInterfaceBase
-  );
-
 VOID
 EFIAPI
 ArmGicEnableDistributor (