MdeModulePkg/UfsPassThruDxe: Use BaseLib linked list iteration macros

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

Replaces usage of the linked list iteration macros defined in UfsPassThru.h
with the common definition in BaseLib.h.

Cc: Dandan Bi <dandan.bi@intel.com>
Cc: Hao A Wu <hao.a.wu@intel.com>
Cc: Jian J Wang <jian.j.wang@intel.com>
Cc: Liming Gao <liming.gao@intel.com>
Cc: Ray Ni <ray.ni@intel.com>
Cc: Sean Brogan <sean.brogan@microsoft.com>
Signed-off-by: Michael Kubacki <michael.kubacki@microsoft.com>
Reviewed-by: Hao A Wu <hao.a.wu@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>
Reviewed-by: Bret Barkelew <bret.barkelew@microsoft.com>

3 files changed, 5 insertions, 10 deletions

diff --git a/MdeModulePkg/Bus/Ufs/UfsPassThruDxe/UfsPassThru.c b/MdeModulePkg/Bus/Ufs/UfsPassThruDxe/UfsPassThru.c
index 26c5a8b855..9768c2e6fb 100644
--- a/MdeModulePkg/Bus/Ufs/UfsPassThruDxe/UfsPassThru.c
+++ b/MdeModulePkg/Bus/Ufs/UfsPassThruDxe/UfsPassThru.c
@@ -1,6 +1,7 @@
 /** @file

 

   Copyright (c) 2014 - 2019, Intel Corporation. All rights reserved.<BR>

+  Copyright (c) Microsoft Corporation.<BR>

   SPDX-License-Identifier: BSD-2-Clause-Patent

 

 **/

@@ -1083,7 +1084,7 @@ UfsPassThruDriverBindingStop (
   // Cleanup the resources of I/O requests in the async I/O queue

   //

   if (!IsListEmpty(&Private->Queue)) {

-    EFI_LIST_FOR_EACH_SAFE (Entry, NextEntry, &Private->Queue) {

+    BASE_LIST_FOR_EACH_SAFE (Entry, NextEntry, &Private->Queue) {

       TransReq  = UFS_PASS_THRU_TRANS_REQ_FROM_THIS (Entry);

 

       //

diff --git a/MdeModulePkg/Bus/Ufs/UfsPassThruDxe/UfsPassThru.h b/MdeModulePkg/Bus/Ufs/UfsPassThruDxe/UfsPassThru.h
index cbc0c2126e..ef33250c89 100644
--- a/MdeModulePkg/Bus/Ufs/UfsPassThruDxe/UfsPassThru.h
+++ b/MdeModulePkg/Bus/Ufs/UfsPassThruDxe/UfsPassThru.h
@@ -1,6 +1,7 @@
 /** @file

 

   Copyright (c) 2014 - 2019, Intel Corporation. All rights reserved.<BR>

+  Copyright (c) Microsoft Corporation.<BR>

   SPDX-License-Identifier: BSD-2-Clause-Patent

 

 **/

@@ -46,14 +47,6 @@ typedef struct {
   UINT16   Rsvd:4;

 } UFS_EXPOSED_LUNS;

 

-//

-// Iterate through the double linked list. This is delete-safe.

-// Do not touch NextEntry

-//

-#define EFI_LIST_FOR_EACH_SAFE(Entry, NextEntry, ListHead)            \

-  for(Entry = (ListHead)->ForwardLink, NextEntry = Entry->ForwardLink;\

-      Entry != (ListHead); Entry = NextEntry, NextEntry = Entry->ForwardLink)

-

 typedef struct _UFS_PASS_THRU_PRIVATE_DATA {

   UINT32                              Signature;

   EFI_HANDLE                          Handle;

diff --git a/MdeModulePkg/Bus/Ufs/UfsPassThruDxe/UfsPassThruHci.c b/MdeModulePkg/Bus/Ufs/UfsPassThruDxe/UfsPassThruHci.c
index 93ac958f65..0b1030ab47 100644
--- a/MdeModulePkg/Bus/Ufs/UfsPassThruDxe/UfsPassThruHci.c
+++ b/MdeModulePkg/Bus/Ufs/UfsPassThruDxe/UfsPassThruHci.c
@@ -3,6 +3,7 @@
   for upper layer application to execute UFS-supported SCSI cmds.

 

   Copyright (c) 2014 - 2019, Intel Corporation. All rights reserved.<BR>

+  Copyright (c) Microsoft Corporation.<BR>

   SPDX-License-Identifier: BSD-2-Clause-Patent

 

 **/

@@ -2285,7 +2286,7 @@ ProcessAsyncTaskList (
   // Check the entries in the async I/O queue are done or not.

   //

   if (!IsListEmpty(&Private->Queue)) {

-    EFI_LIST_FOR_EACH_SAFE (Entry, NextEntry, &Private->Queue) {

+    BASE_LIST_FOR_EACH_SAFE (Entry, NextEntry, &Private->Queue) {

       TransReq  = UFS_PASS_THRU_TRANS_REQ_FROM_THIS (Entry);

       Packet    = TransReq->Packet;