NetworkPkg: Protocol Uninstallation Cleanup

[mirror_edk2.git] / NetworkPkg / DnsDxe / DnsDriver.c

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