Merge the PI enabling works from the branch

[mirror_edk2.git] / MdePkg / Library / PeiSmbusLibSmbus2Ppi / PeiSmbusLib.c

diff --git a/MdePkg/Library/PeiSmbusLibSmbus2Ppi/PeiSmbusLib.c b/MdePkg/Library/PeiSmbusLibSmbus2Ppi/PeiSmbusLib.c
index 103e5ed5c669ebbefb9de3b0cf3bfd08aa9dc762..d78682a694426b66ec76da102fe1a58fd7e55f82 100644 (file)
--- a/MdePkg/Library/PeiSmbusLibSmbus2Ppi/PeiSmbusLib.c
+++ b/MdePkg/Library/PeiSmbusLibSmbus2Ppi/PeiSmbusLib.c
@@ -26,13 +26,13 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 **/\r
 EFI_PEI_SMBUS2_PPI *\r
 InternalGetSmbusPpi (\r
-  EFI_PEI_SERVICES      **PeiServices\r
+  VOID\r
   )\r
 {\r
   EFI_STATUS            Status;\r
   EFI_PEI_SMBUS2_PPI     *SmbusPpi;\r
 \r
-  Status = (*PeiServices)->LocatePpi (PeiServices, &gEfiPeiSmbus2PpiGuid, 0, NULL, (VOID **) &SmbusPpi);\r
+  Status = PeiServicesLocatePpi (&gEfiPeiSmbus2PpiGuid, 0, NULL, (VOID **) &SmbusPpi);\r
   ASSERT_EFI_ERROR (Status);\r
   ASSERT (SmbusPpi != NULL);\r
 \r
@@ -70,12 +70,10 @@ InternalSmBusExec (
   )\r
 {\r
   EFI_PEI_SMBUS2_PPI        *SmbusPpi;\r
-  EFI_PEI_SERVICES          **PeiServices;\r
   RETURN_STATUS             ReturnStatus;\r
   EFI_SMBUS_DEVICE_ADDRESS  SmbusDeviceAddress;\r
 \r
-  PeiServices = GetPeiServicesTablePointer ();\r
-  SmbusPpi    = InternalGetSmbusPpi (PeiServices);\r
+  SmbusPpi    = InternalGetSmbusPpi ();\r
   SmbusDeviceAddress.SmbusDeviceAddress = SMBUS_LIB_SLAVE_ADDRESS (SmBusAddress);\r
 \r
   ReturnStatus = SmbusPpi->Execute (\r