NetworkPkg: Protocol Uninstallation Cleanup

Use UEFILib provided protocol uninstallation abstraction
instead of direct API for a proper cleanup.

REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1444

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Ashish Singhal <ashishsingha@nvidia.com>
Reviewed-by: Wu Jiaxin <jiaxin.wu@intel.com>

diff --git a/NetworkPkg/DnsDxe/DnsDriver.c b/NetworkPkg/DnsDxe/DnsDriver.c
index 1f9b924c0b375971760b98bcf3a34691b2f08240..b74f5ba18e8235f151f720fa9fb2e51819094600 100644 (file)
--- a/NetworkPkg/DnsDxe/DnsDriver.c
+++ b/NetworkPkg/DnsDxe/DnsDriver.c
@@ -510,28 +510,18 @@ DnsDriverEntryPoint (
     FreePool (mDriverData);\r
 \r
   Error2:\r
-     gBS->UninstallMultipleProtocolInterfaces (\r
-           gDns6DriverBinding.DriverBindingHandle,\r
-           &gEfiDriverBindingProtocolGuid,\r
-           &gDns6DriverBinding,\r
-           &gEfiComponentName2ProtocolGuid,\r
-           &gDnsComponentName2,\r
-           &gEfiComponentNameProtocolGuid,\r
-           &gDnsComponentName,\r
-           NULL\r
-           );\r
+     EfiLibUninstallDriverBindingComponentName2 (\r
+       &gDns6DriverBinding,\r
+       &gDnsComponentName,\r
+       &gDnsComponentName2\r
+       );\r
 \r
   Error1:\r
-    gBS->UninstallMultipleProtocolInterfaces (\r
-           ImageHandle,\r
-           &gEfiDriverBindingProtocolGuid,\r
-           &gDns4DriverBinding,\r
-           &gEfiComponentName2ProtocolGuid,\r
-           &gDnsComponentName2,\r
-           &gEfiComponentNameProtocolGuid,\r
-           &gDnsComponentName,\r
-           NULL\r
-           );\r
+    EfiLibUninstallDriverBindingComponentName2 (\r
+      &gDns4DriverBinding,\r
+      &gDnsComponentName,\r
+      &gDnsComponentName2\r
+      );\r
 \r
   return Status;\r
 }\r

diff --git a/NetworkPkg/HttpBootDxe/HttpBootDxe.c b/NetworkPkg/HttpBootDxe/HttpBootDxe.c
index 7ec06f960ddeaeb14804dce4e1659e46024b9098..0b16f9564cda91ef1ffeb44f4e1a07937d2e4d3d 100644 (file)
--- a/NetworkPkg/HttpBootDxe/HttpBootDxe.c
+++ b/NetworkPkg/HttpBootDxe/HttpBootDxe.c
@@ -1327,16 +1327,11 @@ HttpBootDxeDriverEntryPoint (
              &gHttpBootDxeComponentName2\r
              );\r
   if (EFI_ERROR (Status)) {\r
-    gBS->UninstallMultipleProtocolInterfaces(\r
-           ImageHandle,\r
-           &gEfiDriverBindingProtocolGuid,\r
-           &gHttpBootIp4DxeDriverBinding,\r
-           &gEfiComponentName2ProtocolGuid,\r
-           &gHttpBootDxeComponentName2,\r
-           &gEfiComponentNameProtocolGuid,\r
-           &gHttpBootDxeComponentName,\r
-           NULL\r
-           );\r
+    EfiLibUninstallDriverBindingComponentName2(\r
+      &gHttpBootIp4DxeDriverBinding,\r
+      &gHttpBootDxeComponentName,\r
+      &gHttpBootDxeComponentName2\r
+      );\r
   }\r
   return Status;\r
 }\r

diff --git a/NetworkPkg/HttpDxe/HttpDriver.c b/NetworkPkg/HttpDxe/HttpDriver.c
index 8df984db418acc3f2f2e902541536f67027b7d8b..979d76dcb45ed89207d21cb90d2fadf05529177c 100644 (file)
--- a/NetworkPkg/HttpDxe/HttpDriver.c
+++ b/NetworkPkg/HttpDxe/HttpDriver.c
@@ -230,16 +230,11 @@ HttpDxeDriverEntryPoint (
              &gHttpDxeComponentName2\r
              );\r
   if (EFI_ERROR (Status)) {\r
-    gBS->UninstallMultipleProtocolInterfaces (\r
-           ImageHandle,\r
-           &gEfiDriverBindingProtocolGuid,\r
-           &gHttpDxeIp4DriverBinding,\r
-           &gEfiComponentName2ProtocolGuid,\r
-           &gHttpDxeComponentName2,\r
-           &gEfiComponentNameProtocolGuid,\r
-           &gHttpDxeComponentName,\r
-           NULL\r
-           );\r
+    EfiLibUninstallDriverBindingComponentName2 (\r
+      &gHttpDxeIp4DriverBinding,\r
+      &gHttpDxeComponentName,\r
+      &gHttpDxeComponentName2\r
+      );\r
   }\r
   return Status;\r
 }\r

diff --git a/NetworkPkg/IpSecDxe/IpSecDriver.c b/NetworkPkg/IpSecDxe/IpSecDriver.c
index f66f89a4398e98721aee00a0233e53ef9803f7cc..3082d997b7cb44da8d0616bd58ed4816c273a74c 100644 (file)
--- a/NetworkPkg/IpSecDxe/IpSecDriver.c
+++ b/NetworkPkg/IpSecDxe/IpSecDriver.c
@@ -631,16 +631,11 @@ IpSecDriverEntryPoint (
   return Status;\r
 \r
 ON_UNINSTALL_IPSEC4_DB:\r
-  gBS->UninstallMultipleProtocolInterfaces (\r
-         ImageHandle,\r
-         &gEfiDriverBindingProtocolGuid,\r
-         &gIpSec4DriverBinding,\r
-         &gEfiComponentName2ProtocolGuid,\r
-         &gIpSecComponentName2,\r
-         &gEfiComponentNameProtocolGuid,\r
-         &gIpSecComponentName,\r
-         NULL\r
-         );\r
+  EfiLibUninstallDriverBindingComponentName2 (\r
+    &gIpSec4DriverBinding,\r
+    &gIpSecComponentName,\r
+    &gIpSecComponentName2\r
+    );\r
 \r
 ON_UNINSTALL_IPSEC:\r
   gBS->UninstallProtocolInterface (\r

diff --git a/NetworkPkg/TcpDxe/TcpDriver.c b/NetworkPkg/TcpDxe/TcpDriver.c
index 2d4b16cd9e27bc315bae18f9dc5c3e5968126462..00d172b0196b62e19a182a61a1688e008037a212 100644 (file)
--- a/NetworkPkg/TcpDxe/TcpDriver.c
+++ b/NetworkPkg/TcpDxe/TcpDriver.c
@@ -202,16 +202,11 @@ TcpDriverEntryPoint (
              &gTcpComponentName2\r
              );\r
   if (EFI_ERROR (Status)) {\r
-    gBS->UninstallMultipleProtocolInterfaces (\r
-           ImageHandle,\r
-           &gEfiDriverBindingProtocolGuid,\r
-           &gTcp4DriverBinding,\r
-           &gEfiComponentName2ProtocolGuid,\r
-           &gTcpComponentName2,\r
-           &gEfiComponentNameProtocolGuid,\r
-           &gTcpComponentName,\r
-           NULL\r
-           );\r
+    EfiLibUninstallDriverBindingComponentName2 (\r
+      &gTcp4DriverBinding,\r
+      &gTcpComponentName,\r
+      &gTcpComponentName2\r
+      );\r
     return Status;\r
   }\r
 \r

diff --git a/NetworkPkg/UefiPxeBcDxe/PxeBcDriver.c b/NetworkPkg/UefiPxeBcDxe/PxeBcDriver.c
index 0ab640becaf45c96daea38de57fb505598be4f6b..f25c27a94b237eef5f79b73e74f8d49b5f9456fe 100644 (file)
--- a/NetworkPkg/UefiPxeBcDxe/PxeBcDriver.c
+++ b/NetworkPkg/UefiPxeBcDxe/PxeBcDriver.c
@@ -1269,16 +1269,11 @@ PxeBcDriverEntryPoint (
              &gPxeBcComponentName2\r
              );\r
   if (EFI_ERROR (Status)) {\r
-    gBS->UninstallMultipleProtocolInterfaces (\r
-           ImageHandle,\r
-           &gEfiDriverBindingProtocolGuid,\r
-           &gPxeBcIp4DriverBinding,\r
-           &gEfiComponentName2ProtocolGuid,\r
-           &gPxeBcComponentName2,\r
-           &gEfiComponentNameProtocolGuid,\r
-           &gPxeBcComponentName,\r
-           NULL\r
-           );\r
+    EfiLibUninstallDriverBindingComponentName2 (\r
+      &gPxeBcIp4DriverBinding,\r
+      &gPxeBcComponentName,\r
+      &gPxeBcComponentName2\r
+      );\r
   }\r
 \r
   return Status;\r