From: Gary Lin <glin@suse.com>
Date: Fri, 29 Jul 2016 03:25:37 +0000 (+0800)
Subject: Vlv2TbltDevicePkg/PpmPolicy: Remove the usage of global variables
X-Git-Tag: edk2-stable201903~6136
X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=commitdiff_plain;h=55ef35d21eea88a0785cfec47df5059945fb0f0c

Vlv2TbltDevicePkg/PpmPolicy: Remove the usage of global variables

gcc issued the error of "multiple deifintion" since gBS was also defined
in MdePkg/Library/UefiBootServicesTableLib. Actually those global variables,
gBS, pBS, and pRS, in PpmPolicy.h were only used in one function. Besides,
gBS and pRS were not really used. Remove gBS and pRS and declare pBS in
PpmPolicyEntry() to satisfy gcc.

Cc: David Wei <david.wei@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Gary Lin <glin@suse.com>
Reviewed-by: David Wei <david.wei@intel.com>
---

diff --git a/Vlv2TbltDevicePkg/PpmPolicy/PpmPolicy.c b/Vlv2TbltDevicePkg/PpmPolicy/PpmPolicy.c
index 2f8996bc1a..fb4e7fc87b 100644
--- a/Vlv2TbltDevicePkg/PpmPolicy/PpmPolicy.c
+++ b/Vlv2TbltDevicePkg/PpmPolicy/PpmPolicy.c
@@ -33,8 +33,6 @@ Abstract:
 #define EFI_CPUID_MODEL                       0x00F0
 #define EFI_CPUID_STEPPING                    0x000F
 
-
-
 EFI_STATUS 
 EFIAPI
 PpmPolicyEntry(
@@ -42,6 +40,7 @@ PpmPolicyEntry(
   IN EFI_SYSTEM_TABLE *SystemTable
 )
 {
+  EFI_BOOT_SERVICES        *pBS;
   EFI_MP_SERVICES_PROTOCOL *MpService;
   EFI_CPUID_REGISTER        Cpuid01 = { 0, 0, 0, 0};
   EFI_HANDLE                Handle;
@@ -52,15 +51,12 @@ PpmPolicyEntry(
 
   PCH_STEPPING              Stepping;
 
-
-  gBS = SystemTable->BootServices;
   pBS = SystemTable->BootServices;
-  pRS = SystemTable->RuntimeServices;
 
   //
   // Set PPM policy structure to known value
   //
-  gBS->SetMem (&mDxePlatformPpmPolicy, sizeof(PPM_PLATFORM_POLICY_PROTOCOL), 0);
+  pBS->SetMem (&mDxePlatformPpmPolicy, sizeof(PPM_PLATFORM_POLICY_PROTOCOL), 0);
 
   //
   // Find the MpService Protocol
@@ -147,7 +143,7 @@ PpmPolicyEntry(
   mDxePlatformPpmPolicy.S3RestoreMsrSwSmiNumber                       = S3_RESTORE_MSR_SW_SMI;
 
   Handle = NULL;
-  Status = gBS->InstallMultipleProtocolInterfaces (
+  Status = pBS->InstallMultipleProtocolInterfaces (
                                                   &Handle,
                                                   &gPpmPlatformPolicyProtocolGuid,
                                                   &mDxePlatformPpmPolicy,
diff --git a/Vlv2TbltDevicePkg/PpmPolicy/PpmPolicy.h b/Vlv2TbltDevicePkg/PpmPolicy/PpmPolicy.h
index cd3676b3d8..cc7bed74fd 100644
--- a/Vlv2TbltDevicePkg/PpmPolicy/PpmPolicy.h
+++ b/Vlv2TbltDevicePkg/PpmPolicy/PpmPolicy.h
@@ -31,10 +31,6 @@ PPM_PLATFORM_POLICY_PROTOCOL    mDxePlatformPpmPolicy;
 #define  ICH_DEVICE_ENABLE       1
 #define  ICH_DEVICE_DISABLE      0
 
-EFI_BOOT_SERVICES     *gBS;
-EFI_BOOT_SERVICES     *pBS;
-EFI_RUNTIME_SERVICES  *pRS;
-
 #define POWER_STATE_SWITCH_SMI                       43
 #define ENABLE_C_STATE_IO_REDIRECTION_SMI            70
 #define DISABLE_C_STATE_IO_REDIRECTION_SMI           71
@@ -43,4 +39,4 @@ EFI_RUNTIME_SERVICES  *pRS;
 #define ENABLE_P_STATE_HARDWARE_COORDINATION_SMI     74
 #define DISABLE_P_STATE_HARDWARE_COORDINATION_SMI    75
 #define S3_RESTORE_MSR_SW_SMI                        48
-#define ENABLE_C6_RESIDENCY_SMI                      76
\ No newline at end of file
+#define ENABLE_C6_RESIDENCY_SMI                      76