NetworkPkg/IScsiDxe: Use UEFILib APIs to uninstall protocols.

[mirror_edk2.git] / NetworkPkg / IScsiDxe / IScsiDriver.c

diff --git a/NetworkPkg/IScsiDxe/IScsiDriver.c b/NetworkPkg/IScsiDxe/IScsiDriver.c
index 91176e6715a6f7c2b67cca633df875fdf30c71af..8747de7930b035c7c60cb71108502a84896b2e4d 100644 (file)
--- a/NetworkPkg/IScsiDxe/IScsiDriver.c
+++ b/NetworkPkg/IScsiDxe/IScsiDriver.c
@@ -1,6 +1,7 @@
 /** @file\r
   The entry point of IScsi driver.\r
 \r
+Copyright (c) 2019, NVIDIA Corporation. All rights reserved.\r
 Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.<BR>\r
 (C) Copyright 2017 Hewlett Packard Enterprise Development LP<BR>\r
 \r
@@ -1861,28 +1862,18 @@ Error3:
          );\r
 \r
 Error2:\r
-  gBS->UninstallMultipleProtocolInterfaces (\r
-         gIScsiIp6DriverBinding.DriverBindingHandle,\r
-         &gEfiDriverBindingProtocolGuid,\r
-         &gIScsiIp6DriverBinding,\r
-         &gEfiComponentName2ProtocolGuid,\r
-         &gIScsiComponentName2,\r
-         &gEfiComponentNameProtocolGuid,\r
-         &gIScsiComponentName,\r
-         NULL\r
-         );\r
+  EfiLibUninstallDriverBindingComponentName2 (\r
+    &gIScsiIp6DriverBinding,\r
+    &gIScsiComponentName,\r
+    &gIScsiComponentName2\r
+    );\r
 \r
 Error1:\r
-  gBS->UninstallMultipleProtocolInterfaces (\r
-         ImageHandle,\r
-         &gEfiDriverBindingProtocolGuid,\r
-         &gIScsiIp4DriverBinding,\r
-         &gEfiComponentName2ProtocolGuid,\r
-         &gIScsiComponentName2,\r
-         &gEfiComponentNameProtocolGuid,\r
-         &gIScsiComponentName,\r
-         NULL\r
-         );\r
+  EfiLibUninstallDriverBindingComponentName2 (\r
+    &gIScsiIp4DriverBinding,\r
+    &gIScsiComponentName,\r
+    &gIScsiComponentName2\r
+    );\r
 \r
   return Status;\r
 }\r