summaryrefslogtreecommitdiff
path: root/MdeModulePkg/Universal
diff options
context:
space:
mode:
Diffstat (limited to 'MdeModulePkg/Universal')
-rw-r--r--MdeModulePkg/Universal/Console/ConPlatformDxe/ComponentName.c8
-rw-r--r--MdeModulePkg/Universal/Console/ConSplitterDxe/ComponentName.c32
-rw-r--r--MdeModulePkg/Universal/Console/GraphicsConsoleDxe/ComponentName.c8
-rw-r--r--MdeModulePkg/Universal/Console/TerminalDxe/ComponentName.c8
-rw-r--r--MdeModulePkg/Universal/DebugPortDxe/ComponentName.c4
-rw-r--r--MdeModulePkg/Universal/Disk/DiskIoDxe/ComponentName.c8
-rw-r--r--MdeModulePkg/Universal/Disk/PartitionDxe/ComponentName.c8
-rw-r--r--MdeModulePkg/Universal/Network/ArpDxe/ComponentName.c8
-rw-r--r--MdeModulePkg/Universal/Network/Dhcp4Dxe/ComponentName.c8
-rw-r--r--MdeModulePkg/Universal/Network/Ip4ConfigDxe/ComponentName.c8
-rw-r--r--MdeModulePkg/Universal/Network/Ip4Dxe/ComponentName.c8
-rw-r--r--MdeModulePkg/Universal/Network/MnpDxe/ComponentName.c8
-rw-r--r--MdeModulePkg/Universal/Network/Mtftp4Dxe/ComponentName.c8
-rw-r--r--MdeModulePkg/Universal/Network/PxeBcDxe/ComponentName.c8
-rw-r--r--MdeModulePkg/Universal/Network/PxeDhcp4Dxe/ComponentName.c8
-rw-r--r--MdeModulePkg/Universal/Network/SnpDxe/ComponentName.c8
-rw-r--r--MdeModulePkg/Universal/Network/Tcp4Dxe/ComponentName.c8
-rw-r--r--MdeModulePkg/Universal/Network/Udp4Dxe/ComponentName.c8
18 files changed, 82 insertions, 82 deletions
diff --git a/MdeModulePkg/Universal/Console/ConPlatformDxe/ComponentName.c b/MdeModulePkg/Universal/Console/ConPlatformDxe/ComponentName.c
index 9a34e418e2..6010f22bd5 100644
--- a/MdeModulePkg/Universal/Console/ConPlatformDxe/ComponentName.c
+++ b/MdeModulePkg/Universal/Console/ConPlatformDxe/ComponentName.c
@@ -27,20 +27,20 @@ Abstract:
//
// EFI Component Name Protocol
//
-EFI_COMPONENT_NAME_PROTOCOL gConPlatformComponentName = {
+GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME_PROTOCOL gConPlatformComponentName = {
ConPlatformComponentNameGetDriverName,
ConPlatformComponentNameGetControllerName,
"eng"
- };
+};
//
// EFI Component Name 2 Protocol
//
-EFI_COMPONENT_NAME2_PROTOCOL gConPlatformComponentName2 = {
+GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME2_PROTOCOL gConPlatformComponentName2 = {
(EFI_COMPONENT_NAME2_GET_DRIVER_NAME) ConPlatformComponentNameGetDriverName,
(EFI_COMPONENT_NAME2_GET_CONTROLLER_NAME) ConPlatformComponentNameGetControllerName,
"en"
- };
+};
STATIC EFI_UNICODE_STRING_TABLE mConPlatformDriverNameTable[] = {
diff --git a/MdeModulePkg/Universal/Console/ConSplitterDxe/ComponentName.c b/MdeModulePkg/Universal/Console/ConSplitterDxe/ComponentName.c
index 20dba84ef2..6a458436e4 100644
--- a/MdeModulePkg/Universal/Console/ConSplitterDxe/ComponentName.c
+++ b/MdeModulePkg/Universal/Console/ConSplitterDxe/ComponentName.c
@@ -22,77 +22,77 @@ Abstract:
//
// EFI Component Name Protocol
//
-EFI_COMPONENT_NAME_PROTOCOL gConSplitterConInComponentName = {
+GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME_PROTOCOL gConSplitterConInComponentName = {
ConSplitterComponentNameGetDriverName,
ConSplitterConInComponentNameGetControllerName,
"eng"
- };
+};
//
// EFI Component Name 2 Protocol
//
-EFI_COMPONENT_NAME2_PROTOCOL gConSplitterConInComponentName2 = {
+GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME2_PROTOCOL gConSplitterConInComponentName2 = {
(EFI_COMPONENT_NAME2_GET_DRIVER_NAME) ConSplitterComponentNameGetDriverName,
(EFI_COMPONENT_NAME2_GET_CONTROLLER_NAME) ConSplitterConInComponentNameGetControllerName,
"en"
- };
+};
//
// EFI Component Name Protocol
//
-EFI_COMPONENT_NAME_PROTOCOL gConSplitterSimplePointerComponentName = {
+GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME_PROTOCOL gConSplitterSimplePointerComponentName = {
ConSplitterComponentNameGetDriverName,
ConSplitterSimplePointerComponentNameGetControllerName,
"eng"
- };
+};
//
// EFI Component Name 2 Protocol
//
-EFI_COMPONENT_NAME2_PROTOCOL gConSplitterSimplePointerComponentName2 = {
+GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME2_PROTOCOL gConSplitterSimplePointerComponentName2 = {
(EFI_COMPONENT_NAME2_GET_DRIVER_NAME) ConSplitterComponentNameGetDriverName,
(EFI_COMPONENT_NAME2_GET_CONTROLLER_NAME) ConSplitterSimplePointerComponentNameGetControllerName,
"en"
- };
+};
//
// EFI Component Name Protocol
//
-EFI_COMPONENT_NAME_PROTOCOL gConSplitterConOutComponentName = {
+GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME_PROTOCOL gConSplitterConOutComponentName = {
ConSplitterComponentNameGetDriverName,
ConSplitterConOutComponentNameGetControllerName,
"eng"
- };
+};
//
// EFI Component Name 2 Protocol
//
-EFI_COMPONENT_NAME2_PROTOCOL gConSplitterConOutComponentName2 = {
+GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME2_PROTOCOL gConSplitterConOutComponentName2 = {
(EFI_COMPONENT_NAME2_GET_DRIVER_NAME) ConSplitterComponentNameGetDriverName,
(EFI_COMPONENT_NAME2_GET_CONTROLLER_NAME) ConSplitterConOutComponentNameGetControllerName,
"en"
- };
+};
//
// EFI Component Name Protocol
//
-EFI_COMPONENT_NAME_PROTOCOL gConSplitterStdErrComponentName = {
+GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME_PROTOCOL gConSplitterStdErrComponentName = {
ConSplitterComponentNameGetDriverName,
ConSplitterStdErrComponentNameGetControllerName,
"eng"
- };
+};
//
// EFI Component Name 2 Protocol
//
-EFI_COMPONENT_NAME2_PROTOCOL gConSplitterStdErrComponentName2 = {
+GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME2_PROTOCOL gConSplitterStdErrComponentName2 = {
(EFI_COMPONENT_NAME2_GET_DRIVER_NAME) ConSplitterComponentNameGetDriverName,
(EFI_COMPONENT_NAME2_GET_CONTROLLER_NAME) ConSplitterStdErrComponentNameGetControllerName,
"en"
- };
+};
static EFI_UNICODE_STRING_TABLE mConSplitterDriverNameTable[] = {
diff --git a/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/ComponentName.c b/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/ComponentName.c
index 465acab052..7c458baa2c 100644
--- a/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/ComponentName.c
+++ b/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/ComponentName.c
@@ -22,20 +22,20 @@ Abstract:
//
// EFI Component Name Protocol
//
-EFI_COMPONENT_NAME_PROTOCOL gGraphicsConsoleComponentName = {
+GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME_PROTOCOL gGraphicsConsoleComponentName = {
GraphicsConsoleComponentNameGetDriverName,
GraphicsConsoleComponentNameGetControllerName,
"eng"
- };
+};
//
// EFI Component Name 2 Protocol
//
-EFI_COMPONENT_NAME2_PROTOCOL gGraphicsConsoleComponentName2 = {
+GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME2_PROTOCOL gGraphicsConsoleComponentName2 = {
(EFI_COMPONENT_NAME2_GET_DRIVER_NAME) GraphicsConsoleComponentNameGetDriverName,
(EFI_COMPONENT_NAME2_GET_CONTROLLER_NAME) GraphicsConsoleComponentNameGetControllerName,
"en"
- };
+};
STATIC EFI_UNICODE_STRING_TABLE mGraphicsConsoleDriverNameTable[] = {
diff --git a/MdeModulePkg/Universal/Console/TerminalDxe/ComponentName.c b/MdeModulePkg/Universal/Console/TerminalDxe/ComponentName.c
index 7e99b0188a..5bcc85b5b7 100644
--- a/MdeModulePkg/Universal/Console/TerminalDxe/ComponentName.c
+++ b/MdeModulePkg/Universal/Console/TerminalDxe/ComponentName.c
@@ -22,20 +22,20 @@ Abstract:
//
// EFI Component Name Protocol
//
-EFI_COMPONENT_NAME_PROTOCOL gTerminalComponentName = {
+GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME_PROTOCOL gTerminalComponentName = {
TerminalComponentNameGetDriverName,
TerminalComponentNameGetControllerName,
"eng"
- };
+};
//
// EFI Component Name 2 Protocol
//
-EFI_COMPONENT_NAME2_PROTOCOL gTerminalComponentName2 = {
+GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME2_PROTOCOL gTerminalComponentName2 = {
(EFI_COMPONENT_NAME2_GET_DRIVER_NAME) TerminalComponentNameGetDriverName,
(EFI_COMPONENT_NAME2_GET_CONTROLLER_NAME) TerminalComponentNameGetControllerName,
"en"
- };
+};
static EFI_UNICODE_STRING_TABLE mTerminalDriverNameTable[] = {
diff --git a/MdeModulePkg/Universal/DebugPortDxe/ComponentName.c b/MdeModulePkg/Universal/DebugPortDxe/ComponentName.c
index 775961412c..e6a5248b18 100644
--- a/MdeModulePkg/Universal/DebugPortDxe/ComponentName.c
+++ b/MdeModulePkg/Universal/DebugPortDxe/ComponentName.c
@@ -22,7 +22,7 @@ Abstract:
//
// EFI Component Name Protocol
//
-EFI_COMPONENT_NAME_PROTOCOL gDebugPortComponentName = {
+GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME_PROTOCOL gDebugPortComponentName = {
DebugPortComponentNameGetDriverName,
DebugPortComponentNameGetControllerName,
"eng"
@@ -31,7 +31,7 @@ EFI_COMPONENT_NAME_PROTOCOL gDebugPortComponentName = {
//
// EFI Component Name 2 Protocol
//
-EFI_COMPONENT_NAME2_PROTOCOL gDebugPortComponentName2 = {
+GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME2_PROTOCOL gDebugPortComponentName2 = {
(EFI_COMPONENT_NAME2_GET_DRIVER_NAME) DebugPortComponentNameGetDriverName,
(EFI_COMPONENT_NAME2_GET_CONTROLLER_NAME) DebugPortComponentNameGetControllerName,
"en"
diff --git a/MdeModulePkg/Universal/Disk/DiskIoDxe/ComponentName.c b/MdeModulePkg/Universal/Disk/DiskIoDxe/ComponentName.c
index 96fee5cb5f..e957212f27 100644
--- a/MdeModulePkg/Universal/Disk/DiskIoDxe/ComponentName.c
+++ b/MdeModulePkg/Universal/Disk/DiskIoDxe/ComponentName.c
@@ -17,20 +17,20 @@
//
// EFI Component Name Protocol
//
-EFI_COMPONENT_NAME_PROTOCOL gDiskIoComponentName = {
+GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME_PROTOCOL gDiskIoComponentName = {
DiskIoComponentNameGetDriverName,
DiskIoComponentNameGetControllerName,
"eng"
- };
+};
//
// EFI Component Name 2 Protocol
//
-EFI_COMPONENT_NAME2_PROTOCOL gDiskIoComponentName2 = {
+GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME2_PROTOCOL gDiskIoComponentName2 = {
(EFI_COMPONENT_NAME2_GET_DRIVER_NAME) DiskIoComponentNameGetDriverName,
(EFI_COMPONENT_NAME2_GET_CONTROLLER_NAME) DiskIoComponentNameGetControllerName,
"en"
- };
+};
static EFI_UNICODE_STRING_TABLE mDiskIoDriverNameTable[] = {
diff --git a/MdeModulePkg/Universal/Disk/PartitionDxe/ComponentName.c b/MdeModulePkg/Universal/Disk/PartitionDxe/ComponentName.c
index 6daf8d8abb..c339c9e2bf 100644
--- a/MdeModulePkg/Universal/Disk/PartitionDxe/ComponentName.c
+++ b/MdeModulePkg/Universal/Disk/PartitionDxe/ComponentName.c
@@ -17,20 +17,20 @@
//
// EFI Component Name Protocol
//
-EFI_COMPONENT_NAME_PROTOCOL gPartitionComponentName = {
+GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME_PROTOCOL gPartitionComponentName = {
PartitionComponentNameGetDriverName,
PartitionComponentNameGetControllerName,
"eng"
- };
+};
//
// EFI Component Name 2 Protocol
//
-EFI_COMPONENT_NAME2_PROTOCOL gPartitionComponentName2 = {
+GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME2_PROTOCOL gPartitionComponentName2 = {
(EFI_COMPONENT_NAME2_GET_DRIVER_NAME) PartitionComponentNameGetDriverName,
(EFI_COMPONENT_NAME2_GET_CONTROLLER_NAME) PartitionComponentNameGetControllerName,
"en"
- };
+};
static EFI_UNICODE_STRING_TABLE mPartitionDriverNameTable[] = {
diff --git a/MdeModulePkg/Universal/Network/ArpDxe/ComponentName.c b/MdeModulePkg/Universal/Network/ArpDxe/ComponentName.c
index 47d7bd70ae..a05a3a7a8b 100644
--- a/MdeModulePkg/Universal/Network/ArpDxe/ComponentName.c
+++ b/MdeModulePkg/Universal/Network/ArpDxe/ComponentName.c
@@ -153,20 +153,20 @@ ArpComponentNameGetControllerName (
//
// EFI Component Name Protocol
//
-EFI_COMPONENT_NAME_PROTOCOL gArpComponentName = {
+GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME_PROTOCOL gArpComponentName = {
ArpComponentNameGetDriverName,
ArpComponentNameGetControllerName,
"eng"
- };
+};
//
// EFI Component Name 2 Protocol
//
-EFI_COMPONENT_NAME2_PROTOCOL gArpComponentName2 = {
+GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME2_PROTOCOL gArpComponentName2 = {
(EFI_COMPONENT_NAME2_GET_DRIVER_NAME) ArpComponentNameGetDriverName,
(EFI_COMPONENT_NAME2_GET_CONTROLLER_NAME) ArpComponentNameGetControllerName,
"en"
- };
+};
STATIC EFI_UNICODE_STRING_TABLE mArpDriverNameTable[] = {
diff --git a/MdeModulePkg/Universal/Network/Dhcp4Dxe/ComponentName.c b/MdeModulePkg/Universal/Network/Dhcp4Dxe/ComponentName.c
index 8402ae5cfa..5e3b0966d5 100644
--- a/MdeModulePkg/Universal/Network/Dhcp4Dxe/ComponentName.c
+++ b/MdeModulePkg/Universal/Network/Dhcp4Dxe/ComponentName.c
@@ -154,20 +154,20 @@ DhcpComponentNameGetControllerName (
//
// EFI Component Name Protocol
//
-EFI_COMPONENT_NAME_PROTOCOL gDhcp4ComponentName = {
+GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME_PROTOCOL gDhcp4ComponentName = {
DhcpComponentNameGetDriverName,
DhcpComponentNameGetControllerName,
"eng"
- };
+};
//
// EFI Component Name 2 Protocol
//
-EFI_COMPONENT_NAME2_PROTOCOL gDhcp4ComponentName2 = {
+GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME2_PROTOCOL gDhcp4ComponentName2 = {
(EFI_COMPONENT_NAME2_GET_DRIVER_NAME) DhcpComponentNameGetDriverName,
(EFI_COMPONENT_NAME2_GET_CONTROLLER_NAME) DhcpComponentNameGetControllerName,
"en"
- };
+};
static EFI_UNICODE_STRING_TABLE mDhcpDriverNameTable[] = {
diff --git a/MdeModulePkg/Universal/Network/Ip4ConfigDxe/ComponentName.c b/MdeModulePkg/Universal/Network/Ip4ConfigDxe/ComponentName.c
index 1fbee2a097..f3f8e5a7dd 100644
--- a/MdeModulePkg/Universal/Network/Ip4ConfigDxe/ComponentName.c
+++ b/MdeModulePkg/Universal/Network/Ip4ConfigDxe/ComponentName.c
@@ -154,20 +154,20 @@ Ip4ConfigComponentNameGetControllerName (
//
// EFI Component Name Protocol
//
-EFI_COMPONENT_NAME_PROTOCOL gIp4ConfigComponentName = {
+GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME_PROTOCOL gIp4ConfigComponentName = {
Ip4ConfigComponentNameGetDriverName,
Ip4ConfigComponentNameGetControllerName,
"eng"
- };
+};
//
// EFI Component Name 2 Protocol
//
-EFI_COMPONENT_NAME2_PROTOCOL gIp4ConfigComponentName2 = {
+GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME2_PROTOCOL gIp4ConfigComponentName2 = {
(EFI_COMPONENT_NAME2_GET_DRIVER_NAME) Ip4ConfigComponentNameGetDriverName,
(EFI_COMPONENT_NAME2_GET_CONTROLLER_NAME) Ip4ConfigComponentNameGetControllerName,
"en"
- };
+};
STATIC
diff --git a/MdeModulePkg/Universal/Network/Ip4Dxe/ComponentName.c b/MdeModulePkg/Universal/Network/Ip4Dxe/ComponentName.c
index 01642c2383..6d5f7c126e 100644
--- a/MdeModulePkg/Universal/Network/Ip4Dxe/ComponentName.c
+++ b/MdeModulePkg/Universal/Network/Ip4Dxe/ComponentName.c
@@ -154,20 +154,20 @@ Ip4ComponentNameGetControllerName (
//
// EFI Component Name Protocol
//
-EFI_COMPONENT_NAME_PROTOCOL gIp4ComponentName = {
+GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME_PROTOCOL gIp4ComponentName = {
Ip4ComponentNameGetDriverName,
Ip4ComponentNameGetControllerName,
"eng"
- };
+};
//
// EFI Component Name 2 Protocol
//
-EFI_COMPONENT_NAME2_PROTOCOL gIp4ComponentName2 = {
+GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME2_PROTOCOL gIp4ComponentName2 = {
(EFI_COMPONENT_NAME2_GET_DRIVER_NAME) Ip4ComponentNameGetDriverName,
(EFI_COMPONENT_NAME2_GET_CONTROLLER_NAME) Ip4ComponentNameGetControllerName,
"en"
- };
+};
static EFI_UNICODE_STRING_TABLE mIp4DriverNameTable[] = {
diff --git a/MdeModulePkg/Universal/Network/MnpDxe/ComponentName.c b/MdeModulePkg/Universal/Network/MnpDxe/ComponentName.c
index b2af53cea7..9589c1a143 100644
--- a/MdeModulePkg/Universal/Network/MnpDxe/ComponentName.c
+++ b/MdeModulePkg/Universal/Network/MnpDxe/ComponentName.c
@@ -154,20 +154,20 @@ MnpComponentNameGetControllerName (
//
// EFI Component Name Protocol
//
-EFI_COMPONENT_NAME_PROTOCOL gMnpComponentName = {
+GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME_PROTOCOL gMnpComponentName = {
MnpComponentNameGetDriverName,
MnpComponentNameGetControllerName,
"eng"
- };
+};
//
// EFI Component Name 2 Protocol
//
-EFI_COMPONENT_NAME2_PROTOCOL gMnpComponentName2 = {
+GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME2_PROTOCOL gMnpComponentName2 = {
(EFI_COMPONENT_NAME2_GET_DRIVER_NAME) MnpComponentNameGetDriverName,
(EFI_COMPONENT_NAME2_GET_CONTROLLER_NAME) MnpComponentNameGetControllerName,
"en"
- };
+};
STATIC EFI_UNICODE_STRING_TABLE mMnpDriverNameTable[] = {
diff --git a/MdeModulePkg/Universal/Network/Mtftp4Dxe/ComponentName.c b/MdeModulePkg/Universal/Network/Mtftp4Dxe/ComponentName.c
index 626995b687..60cf82634e 100644
--- a/MdeModulePkg/Universal/Network/Mtftp4Dxe/ComponentName.c
+++ b/MdeModulePkg/Universal/Network/Mtftp4Dxe/ComponentName.c
@@ -153,20 +153,20 @@ Mtftp4ComponentNameGetControllerName (
//
// EFI Component Name Protocol
//
-EFI_COMPONENT_NAME_PROTOCOL gMtftp4ComponentName = {
+GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME_PROTOCOL gMtftp4ComponentName = {
Mtftp4ComponentNameGetDriverName,
Mtftp4ComponentNameGetControllerName,
"eng"
- };
+};
//
// EFI Component Name 2 Protocol
//
-EFI_COMPONENT_NAME2_PROTOCOL gMtftp4ComponentName2 = {
+GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME2_PROTOCOL gMtftp4ComponentName2 = {
(EFI_COMPONENT_NAME2_GET_DRIVER_NAME) Mtftp4ComponentNameGetDriverName,
(EFI_COMPONENT_NAME2_GET_CONTROLLER_NAME) Mtftp4ComponentNameGetControllerName,
"en"
- };
+};
static EFI_UNICODE_STRING_TABLE mMtftp4DriverNameTable[] = {
diff --git a/MdeModulePkg/Universal/Network/PxeBcDxe/ComponentName.c b/MdeModulePkg/Universal/Network/PxeBcDxe/ComponentName.c
index 7aea928fed..c6853c4503 100644
--- a/MdeModulePkg/Universal/Network/PxeBcDxe/ComponentName.c
+++ b/MdeModulePkg/Universal/Network/PxeBcDxe/ComponentName.c
@@ -152,20 +152,20 @@ PxeBcComponentNameGetControllerName (
//
// EFI Component Name Protocol
//
-EFI_COMPONENT_NAME_PROTOCOL gPxeBcComponentName = {
+GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME_PROTOCOL gPxeBcComponentName = {
PxeBcComponentNameGetDriverName,
PxeBcComponentNameGetControllerName,
"eng"
- };
+};
//
// EFI Component Name 2 Protocol
//
-EFI_COMPONENT_NAME2_PROTOCOL gPxeBcComponentName2 = {
+GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME2_PROTOCOL gPxeBcComponentName2 = {
(EFI_COMPONENT_NAME2_GET_DRIVER_NAME) PxeBcComponentNameGetDriverName,
(EFI_COMPONENT_NAME2_GET_CONTROLLER_NAME) PxeBcComponentNameGetControllerName,
"en"
- };
+};
static EFI_UNICODE_STRING_TABLE mPxeBcDriverNameTable[] = {
diff --git a/MdeModulePkg/Universal/Network/PxeDhcp4Dxe/ComponentName.c b/MdeModulePkg/Universal/Network/PxeDhcp4Dxe/ComponentName.c
index 6eae594c4d..b174fe2315 100644
--- a/MdeModulePkg/Universal/Network/PxeDhcp4Dxe/ComponentName.c
+++ b/MdeModulePkg/Universal/Network/PxeDhcp4Dxe/ComponentName.c
@@ -157,20 +157,20 @@ PxeDhcp4ComponentNameGetControllerName (
//
// EFI Component Name Protocol
//
-EFI_COMPONENT_NAME_PROTOCOL gPxeDhcp4ComponentName = {
+GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME_PROTOCOL gPxeDhcp4ComponentName = {
PxeDhcp4ComponentNameGetDriverName,
PxeDhcp4ComponentNameGetControllerName,
"eng"
- };
+};
//
// EFI Component Name 2 Protocol
//
-EFI_COMPONENT_NAME2_PROTOCOL gPxeDhcp4ComponentName2 = {
+GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME2_PROTOCOL gPxeDhcp4ComponentName2 = {
(EFI_COMPONENT_NAME2_GET_DRIVER_NAME) PxeDhcp4ComponentNameGetDriverName,
(EFI_COMPONENT_NAME2_GET_CONTROLLER_NAME) PxeDhcp4ComponentNameGetControllerName,
"en"
- };
+};
static EFI_UNICODE_STRING_TABLE mPxeDhcp4DriverNameTable[] = {
diff --git a/MdeModulePkg/Universal/Network/SnpDxe/ComponentName.c b/MdeModulePkg/Universal/Network/SnpDxe/ComponentName.c
index a2dc8e75af..6cd331b613 100644
--- a/MdeModulePkg/Universal/Network/SnpDxe/ComponentName.c
+++ b/MdeModulePkg/Universal/Network/SnpDxe/ComponentName.c
@@ -155,20 +155,20 @@ SimpleNetworkComponentNameGetControllerName (
//
// EFI Component Name Protocol
//
-EFI_COMPONENT_NAME_PROTOCOL gSimpleNetworkComponentName = {
+GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME_PROTOCOL gSimpleNetworkComponentName = {
SimpleNetworkComponentNameGetDriverName,
SimpleNetworkComponentNameGetControllerName,
"eng"
- };
+};
//
// EFI Component Name 2 Protocol
//
-EFI_COMPONENT_NAME2_PROTOCOL gSimpleNetworkComponentName2 = {
+GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME2_PROTOCOL gSimpleNetworkComponentName2 = {
(EFI_COMPONENT_NAME2_GET_DRIVER_NAME) SimpleNetworkComponentNameGetDriverName,
(EFI_COMPONENT_NAME2_GET_CONTROLLER_NAME) SimpleNetworkComponentNameGetControllerName,
"en"
- };
+};
static EFI_UNICODE_STRING_TABLE mSimpleNetworkDriverNameTable[] = {
diff --git a/MdeModulePkg/Universal/Network/Tcp4Dxe/ComponentName.c b/MdeModulePkg/Universal/Network/Tcp4Dxe/ComponentName.c
index fae269fa16..c5a4b99d7e 100644
--- a/MdeModulePkg/Universal/Network/Tcp4Dxe/ComponentName.c
+++ b/MdeModulePkg/Universal/Network/Tcp4Dxe/ComponentName.c
@@ -153,20 +153,20 @@ TcpComponentNameGetControllerName (
//
// EFI Component Name Protocol
//
-EFI_COMPONENT_NAME_PROTOCOL gTcp4ComponentName = {
+GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME_PROTOCOL gTcp4ComponentName = {
TcpComponentNameGetDriverName,
TcpComponentNameGetControllerName,
"eng"
- };
+};
//
// EFI Component Name 2 Protocol
//
-EFI_COMPONENT_NAME2_PROTOCOL gTcp4ComponentName2 = {
+GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME2_PROTOCOL gTcp4ComponentName2 = {
(EFI_COMPONENT_NAME2_GET_DRIVER_NAME) TcpComponentNameGetDriverName,
(EFI_COMPONENT_NAME2_GET_CONTROLLER_NAME) TcpComponentNameGetControllerName,
"en"
- };
+};
static EFI_UNICODE_STRING_TABLE mTcpDriverNameTable[] = {
diff --git a/MdeModulePkg/Universal/Network/Udp4Dxe/ComponentName.c b/MdeModulePkg/Universal/Network/Udp4Dxe/ComponentName.c
index 7fb1ce9bd7..f7e2ac2ae9 100644
--- a/MdeModulePkg/Universal/Network/Udp4Dxe/ComponentName.c
+++ b/MdeModulePkg/Universal/Network/Udp4Dxe/ComponentName.c
@@ -154,20 +154,20 @@ UdpComponentNameGetControllerName (
//
// EFI Component Name Protocol
//
-EFI_COMPONENT_NAME_PROTOCOL gUdp4ComponentName = {
+GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME_PROTOCOL gUdp4ComponentName = {
UdpComponentNameGetDriverName,
UdpComponentNameGetControllerName,
"eng"
- };
+};
//
// EFI Component Name 2 Protocol
//
-EFI_COMPONENT_NAME2_PROTOCOL gUdp4ComponentName2 = {
+GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME2_PROTOCOL gUdp4ComponentName2 = {
(EFI_COMPONENT_NAME2_GET_DRIVER_NAME) UdpComponentNameGetDriverName,
(EFI_COMPONENT_NAME2_GET_CONTROLLER_NAME) UdpComponentNameGetControllerName,
"en"
- };
+};
static EFI_UNICODE_STRING_TABLE mUdpDriverNameTable[] = {