NetworkPkg/IScsiDxe: clean up library class dependencies

Sort the library class dependencies in the #include directives and in the
INF file. Remove the DpcLib class from the #include directives -- it is
not listed in the INF file, and IScsiDxe doesn't call either DpcLib API
(QueueDpc(), DispatchDpc()). No functional changes.

Cc: Jiaxin Wu <jiaxin.wu@intel.com>
Cc: Maciej Rabeda <maciej.rabeda@linux.intel.com>
Cc: Philippe Mathieu-Daudé <philmd@redhat.com>
Cc: Siyuan Fu <siyuan.fu@intel.com>
Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=3356
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Maciej Rabeda <maciej.rabeda@linux.intel.com>
Message-Id: <20210608121259.32451-5-lersek@redhat.com>

diff --git a/NetworkPkg/IScsiDxe/IScsiDxe.inf b/NetworkPkg/IScsiDxe/IScsiDxe.inf
index 0ffb340ce05eda5f5964bcb8d5e903e3a6e8ac35..543c4083026ac40bbd0d9bb81769b3a7f1939007 100644 (file)
--- a/NetworkPkg/IScsiDxe/IScsiDxe.inf
+++ b/NetworkPkg/IScsiDxe/IScsiDxe.inf
@@ -65,6 +65,7 @@
   NetworkPkg/NetworkPkg.dec\r
 \r
 [LibraryClasses]\r
+  BaseCryptLib\r
   BaseLib\r
   BaseMemoryLib\r
   DebugLib\r
@@ -72,14 +73,13 @@
   HiiLib\r
   MemoryAllocationLib\r
   NetLib\r
-  TcpIoLib\r
   PrintLib\r
+  TcpIoLib\r
   UefiBootServicesTableLib\r
   UefiDriverEntryPoint\r
+  UefiHiiServicesLib\r
   UefiLib\r
   UefiRuntimeServicesTableLib\r
-  UefiHiiServicesLib\r
-  BaseCryptLib\r
 \r
 [Protocols]\r
   gEfiAcpiTableProtocolGuid                     ## SOMETIMES_CONSUMES ## SystemTable\r

diff --git a/NetworkPkg/IScsiDxe/IScsiImpl.h b/NetworkPkg/IScsiDxe/IScsiImpl.h
index 387ab9765e9e105cc29933b5df9f89a719599835..d895c7feb94747325515a0de6b0d14e53fbf4902 100644 (file)
--- a/NetworkPkg/IScsiDxe/IScsiImpl.h
+++ b/NetworkPkg/IScsiDxe/IScsiImpl.h
@@ -35,21 +35,20 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 #include <Protocol/AdapterInformation.h>\r
 #include <Protocol/NetworkInterfaceIdentifier.h>\r
 \r
-#include <Library/HiiLib.h>\r
-#include <Library/UefiHiiServicesLib.h>\r
-#include <Library/DevicePathLib.h>\r
-#include <Library/DebugLib.h>\r
+#include <Library/BaseCryptLib.h>\r
 #include <Library/BaseLib.h>\r
 #include <Library/BaseMemoryLib.h>\r
+#include <Library/DebugLib.h>\r
+#include <Library/DevicePathLib.h>\r
+#include <Library/HiiLib.h>\r
 #include <Library/MemoryAllocationLib.h>\r
+#include <Library/NetLib.h>\r
 #include <Library/PrintLib.h>\r
+#include <Library/TcpIoLib.h>\r
 #include <Library/UefiBootServicesTableLib.h>\r
-#include <Library/UefiRuntimeServicesTableLib.h>\r
+#include <Library/UefiHiiServicesLib.h>\r
 #include <Library/UefiLib.h>\r
-#include <Library/DpcLib.h>\r
-#include <Library/NetLib.h>\r
-#include <Library/TcpIoLib.h>\r
-#include <Library/BaseCryptLib.h>\r
+#include <Library/UefiRuntimeServicesTableLib.h>\r
 \r
 #include <Guid/MdeModuleHii.h>\r
 #include <Guid/EventGroup.h>\r