OvmfPkg/QemuBootOrderLib: rebase to ARRAY_SIZE()

Cc: Jordan Justen <jordan.l.justen@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>

diff --git a/OvmfPkg/Library/QemuBootOrderLib/QemuBootOrderLib.c b/OvmfPkg/Library/QemuBootOrderLib/QemuBootOrderLib.c
index 8cbbdb0568fa57639d5491da9a138bf7b534308d..567f6f92f452f87d1c972bc55d7b9c6b3deef131 100644 (file)
--- a/OvmfPkg/Library/QemuBootOrderLib/QemuBootOrderLib.c
+++ b/OvmfPkg/Library/QemuBootOrderLib/QemuBootOrderLib.c
@@ -707,7 +707,7 @@ TranslatePciOfwNodes (
   // Parse the OFW nodes starting with the first non-bridge node.\r
   //\r
   PciDevFun[1] = 0;\r
-  NumEntries = sizeof (PciDevFun) / sizeof (PciDevFun[0]);\r
+  NumEntries = ARRAY_SIZE (PciDevFun);\r
   if (ParseUnitAddressHexList (\r
         OfwNode[FirstNonBridge].UnitAddress,\r
         PciDevFun,\r
@@ -910,7 +910,7 @@ TranslatePciOfwNodes (
     UINT64 TargetLun[2];\r
 \r
     TargetLun[1] = 0;\r
-    NumEntries = sizeof (TargetLun) / sizeof (TargetLun[0]);\r
+    NumEntries = ARRAY_SIZE (TargetLun);\r
     if (ParseUnitAddressHexList (\r
           OfwNode[FirstNonBridge + 2].UnitAddress,\r
           TargetLun,\r
@@ -958,7 +958,7 @@ TranslatePciOfwNodes (
     UINTN  RequiredEntries;\r
     UINT8  *Eui64;\r
 \r
-    RequiredEntries = sizeof (Namespace) / sizeof (Namespace[0]);\r
+    RequiredEntries = ARRAY_SIZE (Namespace);\r
     NumEntries = RequiredEntries;\r
     if (ParseUnitAddressHexList (\r
           OfwNode[FirstNonBridge + 1].UnitAddress,\r
@@ -1145,7 +1145,7 @@ TranslateMmioOfwNodes (
     UINT64 TargetLun[2];\r
 \r
     TargetLun[1] = 0;\r
-    NumEntries = sizeof (TargetLun) / sizeof (TargetLun[0]);\r
+    NumEntries = ARRAY_SIZE (TargetLun);\r
     if (ParseUnitAddressHexList (\r
           OfwNode[2].UnitAddress,\r
           TargetLun,\r
@@ -1803,7 +1803,7 @@ SetBootOrderFromQemu (
   //\r
   // translate each OpenFirmware path\r
   //\r
-  TranslatedSize = sizeof (Translated) / sizeof (Translated[0]);\r
+  TranslatedSize = ARRAY_SIZE (Translated);\r
   Status = TranslateOfwPath (&FwCfgPtr, ExtraPciRoots, Translated,\r
              &TranslatedSize);\r
   while (Status == RETURN_SUCCESS ||\r
@@ -1835,7 +1835,7 @@ SetBootOrderFromQemu (
       } // scanned all active boot options\r
     }   // translation successful\r
 \r
-    TranslatedSize = sizeof (Translated) / sizeof (Translated[0]);\r
+    TranslatedSize = ARRAY_SIZE (Translated);\r
     Status = TranslateOfwPath (&FwCfgPtr, ExtraPciRoots, Translated,\r
                &TranslatedSize);\r
   } // scanning of OpenFirmware paths done\r