[edk2-devel][PATCH v2 0/1] Coding style violation fix

[edk2-devel][PATCH v2 0/1] Coding style violation fix

[Paweł Poławski]

Hello edk2-devel list,

Laszlo Ersek in his email to edk2-devel related to
"CPU count limitation in CpuMpPei BIST processing"
pointed out coding style violation related to local variable
and function name overlap.

This patch addresses mentioned issue.

This is the version 2. Comparing to v1 new variable name has been
changed according to ray.ni@intel.com suggestion.

Reference branch: https://github.com/elkoniu/edk2/tree/coding-style-fix

Best regards,
Pawel


Cc: Eric Dong <eric.dong@intel.com>
Cc: Ray Ni <ray.ni@intel.com>
Cc: Rahul Kumar <rahul1.kumar@intel.com>

Paweł Poławski (1):
  UefiCpuPkg: Coding style bug fix

 UefiCpuPkg/CpuMpPei/CpuBist.c | 40 ++++++++++----------
 1 file changed, 20 insertions(+), 20 deletions(-)

-- 
2.36.1

[edk2-devel][PATCH v2 1/1] UefiCpuPkg: Coding style bug fix

[Paweł Poławski]

Local variable name overlaped with function name.
Variable name has been updated to remove name duplication.

Cc: Eric Dong <eric.dong@intel.com>
Cc: Ray Ni <ray.ni@intel.com>
Cc: Rahul Kumar <rahul1.kumar@intel.com>

Signed-off-by: Paweł Poławski <ppolawsk@redhat.com>
---
 UefiCpuPkg/CpuMpPei/CpuBist.c | 40 ++++++++++----------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/UefiCpuPkg/CpuMpPei/CpuBist.c b/UefiCpuPkg/CpuMpPei/CpuBist.c
index 7dc93cd784d4..32b78e84c727 100644
--- a/UefiCpuPkg/CpuMpPei/CpuBist.c
+++ b/UefiCpuPkg/CpuMpPei/CpuBist.c
@@ -91,7 +91,7 @@ GetBistInfoFromPpi (
 {
   EFI_STATUS                            Status;
   EFI_SEC_PLATFORM_INFORMATION2_PPI     *SecPlatformInformation2Ppi;
-  EFI_SEC_PLATFORM_INFORMATION_RECORD2  *SecPlatformInformation2;
+  EFI_SEC_PLATFORM_INFORMATION_RECORD2  *SecPlatformInformationRecord2;
   UINT64                                InformationSize;
 
   Status = PeiServicesLocatePpi (
@@ -108,17 +108,17 @@ GetBistInfoFromPpi (
     //
     // Get the size of the sec platform information2(BSP/APs' BIST data)
     //
-    InformationSize         = 0;
-    SecPlatformInformation2 = NULL;
-    Status                  = SecPlatformInformation2Ppi->PlatformInformation2 (
-                                                            PeiServices,
-                                                            &InformationSize,
-                                                            SecPlatformInformation2
-                                                            );
+    InformationSize               = 0;
+    SecPlatformInformationRecord2 = NULL;
+    Status                        = SecPlatformInformation2Ppi->PlatformInformation2 (
+                                                                  PeiServices,
+                                                                  &InformationSize,
+                                                                  SecPlatformInformationRecord2
+                                                                  );
     if (Status == EFI_BUFFER_TOO_SMALL) {
       Status = PeiServicesAllocatePool (
                  (UINTN)InformationSize,
-                 (VOID **)&SecPlatformInformation2
+                 (VOID **)&SecPlatformInformationRecord2
                  );
       if (Status == EFI_SUCCESS) {
         //
@@ -127,10 +127,10 @@ GetBistInfoFromPpi (
         Status = SecPlatformInformation2Ppi->PlatformInformation2 (
                                                PeiServices,
                                                &InformationSize,
-                                               SecPlatformInformation2
+                                               SecPlatformInformationRecord2
                                                );
         if (Status == EFI_SUCCESS) {
-          *BistInformationData = SecPlatformInformation2;
+          *BistInformationData = SecPlatformInformationRecord2;
           if (BistInformationSize != NULL) {
             *BistInformationSize = InformationSize;
           }
@@ -160,7 +160,7 @@ CollectBistDataFromPpi (
 {
   EFI_STATUS                            Status;
   EFI_PEI_PPI_DESCRIPTOR                *SecInformationDescriptor;
-  EFI_SEC_PLATFORM_INFORMATION_RECORD2  *SecPlatformInformation2;
+  EFI_SEC_PLATFORM_INFORMATION_RECORD2  *SecPlatformInformationRecord2;
   EFI_SEC_PLATFORM_INFORMATION_RECORD   *SecPlatformInformation;
   UINTN                                 NumberOfData;
   EFI_SEC_PLATFORM_INFORMATION_CPU      *CpuInstance;
@@ -186,10 +186,10 @@ CollectBistDataFromPpi (
   ASSERT_EFI_ERROR (Status);
   PlatformInformationRecord2->NumberOfCpus = (UINT32)NumberOfProcessors;
 
-  SecPlatformInformation2 = NULL;
-  SecPlatformInformation  = NULL;
-  NumberOfData            = 0;
-  CpuInstance             = NULL;
+  SecPlatformInformationRecord2 = NULL;
+  SecPlatformInformation        = NULL;
+  NumberOfData                  = 0;
+  CpuInstance                   = NULL;
   //
   // Get BIST information from Sec Platform Information2 Ppi firstly
   //
@@ -197,15 +197,15 @@ CollectBistDataFromPpi (
              PeiServices,
              &gEfiSecPlatformInformation2PpiGuid,
              &SecInformationDescriptor,
-             (VOID *)&SecPlatformInformation2,
+             (VOID *)&SecPlatformInformationRecord2,
              NULL
              );
   if (Status == EFI_SUCCESS) {
     //
     // Sec Platform Information2 PPI includes BSP/APs' BIST information
     //
-    NumberOfData = SecPlatformInformation2->NumberOfCpus;
-    CpuInstance  = SecPlatformInformation2->CpuInstance;
+    NumberOfData = SecPlatformInformationRecord2->NumberOfCpus;
+    CpuInstance  = SecPlatformInformationRecord2->CpuInstance;
   } else {
     //
     // Otherwise, get BIST information from Sec Platform Information Ppi
@@ -274,7 +274,7 @@ CollectBistDataFromPpi (
     (UINTN)BistInformationSize
     );
 
-  if (SecPlatformInformation2 != NULL) {
+  if (SecPlatformInformationRecord2 != NULL) {
     if (NumberOfData < NumberOfProcessors) {
       //
       // Reinstall SecPlatformInformation2 PPI to include new BIST information
-- 
2.36.1

Re: [edk2-devel][PATCH v2 1/1] UefiCpuPkg: Coding style bug fix

[Gerd Hoffmann]

On Wed, Jul 06, 2022 at 10:37:54AM +0200, Paweł Poławski wrote:
> Local variable name overlaped with function name.
> Variable name has been updated to remove name duplication.
> 
> Cc: Eric Dong <eric.dong@intel.com>
> Cc: Ray Ni <ray.ni@intel.com>
> Cc: Rahul Kumar <rahul1.kumar@intel.com>
> 
> Signed-off-by: Paweł Poławski <ppolawsk@redhat.com>

Acked-by: Gerd Hoffmann <kraxel@redhat.com>

Ray?  I think this can be merged?

thanks,
  Gerd