Fix ICC warnings

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@6714 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/MdePkg/Library/PeiPciLibPciCfg2/PciLib.c b/MdePkg/Library/PeiPciLibPciCfg2/PciLib.c
index 080195f6930e53ed28e3a9f8afa6bce591ff2dc4..71b149639fdabc67f815b58fe34fed6870d894cb 100644 (file)
--- a/MdePkg/Library/PeiPciLibPciCfg2/PciLib.c
+++ b/MdePkg/Library/PeiPciLibPciCfg2/PciLib.c
@@ -67,16 +67,18 @@ PeiPciLibPciCfg2ReadWorker (
   EFI_STATUS                   Status;\r
   UINT32                       Data;\r
   CONST EFI_PEI_PCI_CFG2_PPI   *PciCfg2Ppi;\r
+  UINT64                       PciCfg2Address;\r
 \r
   Status = PeiServicesLocatePpi (&gEfiPciCfg2PpiGuid, 0, NULL, (VOID **) &PciCfg2Ppi);\r
   ASSERT_EFI_ERROR (Status);\r
   ASSERT (PciCfg2Ppi != NULL);\r
 \r
+  PciCfg2Address = PCI_TO_PCICFG2_ADDRESS (Address);\r
   PciCfg2Ppi->Read (\r
                 GetPeiServicesTablePointer (),\r
                 PciCfg2Ppi,\r
                 Width,\r
-                PCI_TO_PCICFG2_ADDRESS (Address),\r
+                PciCfg2Address,\r
                 &Data\r
                 );\r
 \r
@@ -108,16 +110,18 @@ PeiPciLibPciCfg2WriteWorker (
 {\r
   EFI_STATUS                      Status;\r
   CONST EFI_PEI_PCI_CFG2_PPI      *PciCfg2Ppi;\r
+  UINT64                          PciCfg2Address;\r
 \r
   Status = PeiServicesLocatePpi (&gEfiPciCfg2PpiGuid, 0, NULL, (VOID **) &PciCfg2Ppi);\r
   ASSERT_EFI_ERROR (Status);\r
   ASSERT (PciCfg2Ppi != NULL);\r
 \r
+  PciCfg2Address = PCI_TO_PCICFG2_ADDRESS (Address);\r
   PciCfg2Ppi->Write (\r
                 GetPeiServicesTablePointer (),\r
                 PciCfg2Ppi,\r
                 Width,\r
-                PCI_TO_PCICFG2_ADDRESS (Address),\r
+                PciCfg2Address,\r
                 &Data\r
                 );\r
 \r

diff --git a/MdePkg/Library/PeiPciSegmentLibPciCfg2/PciSegmentLib.c b/MdePkg/Library/PeiPciSegmentLibPciCfg2/PciSegmentLib.c
index 453f2ded0f718f02bf11ff786ee24179f2ec2bc6..729391d9c995fa84094c6a123530223396558c1a 100644 (file)
--- a/MdePkg/Library/PeiPciSegmentLibPciCfg2/PciSegmentLib.c
+++ b/MdePkg/Library/PeiPciSegmentLibPciCfg2/PciSegmentLib.c
@@ -107,14 +107,15 @@ PeiPciSegmentLibPciCfg2ReadWorker (
 {\r
   UINT32                       Data;\r
   CONST EFI_PEI_PCI_CFG2_PPI   *PciCfg2Ppi;\r
+  UINT64                       PciCfg2Address;\r
 \r
   PciCfg2Ppi = InternalGetPciCfg2Ppi (Address);\r
-\r
+  PciCfg2Address = PCI_TO_PCICFG2_ADDRESS (Address);\r
   PciCfg2Ppi->Read (\r
                 GetPeiServicesTablePointer (),\r
                 PciCfg2Ppi,\r
                 Width,\r
-                PCI_TO_PCICFG2_ADDRESS (Address),\r
+                PciCfg2Address,\r
                 &Data\r
                 );\r
 \r
@@ -145,14 +146,15 @@ PeiPciSegmentLibPciCfg2WriteWorker (
   )\r
 {\r
   CONST EFI_PEI_PCI_CFG2_PPI   *PciCfg2Ppi;\r
+  UINT64                       PciCfg2Address;\r
 \r
   PciCfg2Ppi = InternalGetPciCfg2Ppi (Address);\r
-\r
+  PciCfg2Address = PCI_TO_PCICFG2_ADDRESS (Address);\r
   PciCfg2Ppi->Write (\r
                 GetPeiServicesTablePointer (),\r
                 PciCfg2Ppi,\r
                 Width,\r
-                PCI_TO_PCICFG2_ADDRESS (Address),\r
+                PciCfg2Address,\r
                 &Data\r
                 );\r
 \r