5 files changed, 14 insertions, 19 deletions
diff --git a/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/SmBiosCpu/Cpu.h b/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/SmBiosCpu/Cpu.h
index 872492f4c3..cd8e0ee467 100644
--- a/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/SmBiosCpu/Cpu.h
+++ b/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/SmBiosCpu/Cpu.h
@@ -287,3 +287,4 @@
 #define V_CONFIG_TDP_LEVEL2                         2
 
 #endif
+
diff --git a/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/SmBiosCpu/CpuConfigLib.h b/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/SmBiosCpu/CpuConfigLib.h
index 99d6807bb9..c0ff6db748 100644
--- a/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/SmBiosCpu/CpuConfigLib.h
+++ b/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/SmBiosCpu/CpuConfigLib.h
@@ -683,3 +683,4 @@ SetAndReadCpuCallbackSignal (
   );
 
 #endif
+
diff --git a/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/SmBiosCpu/SmBiosCpu.c b/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/SmBiosCpu/SmBiosCpu.c
index c67bcf9785..52ee6ae950 100644
--- a/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/SmBiosCpu/SmBiosCpu.c
+++ b/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/SmBiosCpu/SmBiosCpu.c
@@ -40,7 +40,6 @@
 #include "SocketLga1156Lib.h"
 #include <Library/SynchronizationLib.h>
 #include <Library/TimerLib.h>
-#include "MiscSubclassDriver.h"
 
 #define PLATFORM_DESKTOP           0
 #define PLATFORM_MOBILE            1
@@ -999,10 +998,10 @@ AddSmbiosCacheTypeTable (
     //
     SmbiosHandle = SMBIOS_HANDLE_PI_RESERVED;
     Status = Smbios->Add ( Smbios,
-                           NULL,
-                           &SmbiosHandle,
-                           (EFI_SMBIOS_TABLE_HEADER*) SmbiosRecord
-                          );
+                         NULL,
+               &SmbiosHandle,
+               (EFI_SMBIOS_TABLE_HEADER*) SmbiosRecord
+              );
 
     //
     // Record L1/L2/L3 Cache Smbios Handle, Type 4 SMBIOS Record needs it.
@@ -1220,15 +1219,7 @@ AddSmbiosProcessorTypeTable (
   // Get CPU Version string.
   //
   GetProcessorVersion (ProcessorNumber, &Version);
-  if (Version.StringValid) {
-    Token = HiiSetString (mHiiHandle, 0, Version.BrandString, NULL);
-    if (Token == 0) {
-      Token = Version.StringRef;
-    }
-  } else {
-      Token = Version.StringRef;
-  }
-  CpuVerStr = HiiGetPackageString (&gEfiCallerIdGuid, Token, NULL);
+  CpuVerStr = Version.BrandString;
   ASSERT (CpuVerStr != NULL);
   CpuVerStrLen = StrLen (CpuVerStr);
   ASSERT (CpuVerStrLen <= SMBIOS_STRING_MAX_LENGTH);
@@ -1359,10 +1350,10 @@ AddSmbiosProcessorTypeTable (
   //
   SmbiosHandle = SMBIOS_HANDLE_PI_RESERVED;
   Status = Smbios->Add ( Smbios,
-                         NULL,
-                         &SmbiosHandle,
-                         (EFI_SMBIOS_TABLE_HEADER*) SmbiosRecord
-                        );
+                       NULL,
+             &SmbiosHandle,
+             (EFI_SMBIOS_TABLE_HEADER*) SmbiosRecord
+            );
   FreePool (SmbiosRecord);
   FreePool (CpuSocketStr);
   FreePool (CpuManuStr);
@@ -1392,7 +1383,7 @@ GetSmbiosCpuInformation ( EFI_SMBIOS_PROTOCOL  *Smbios
 
 --*/
 {
-  EFI_STATUS              Status = EFI_SUCCESS;
+  EFI_STATUS        Status = EFI_SUCCESS;
   EFI_MP_SERVICES_PROTOCOL      *MpService;
   UINTN                         MaximumNumberOfCPUs;
   UINTN                         NumberOfEnabledCPUs;
@@ -1489,3 +1480,4 @@ GetSmbiosCpuInformation ( EFI_SMBIOS_PROTOCOL  *Smbios
 
   return Status;
 }
+
diff --git a/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/SmBiosCpu/SocketLga1156Lib.h b/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/SmBiosCpu/SocketLga1156Lib.h
index 239485e85c..3da5e2c817 100644
--- a/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/SmBiosCpu/SocketLga1156Lib.h
+++ b/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/SmBiosCpu/SocketLga1156Lib.h
@@ -190,3 +190,4 @@
 #define EFI_MSR_GV_THERM                    0x19D
 
 #endif
+
diff --git a/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/SmBiosCpu/Strings.uni b/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/SmBiosCpu/Strings.uni
index ee3e2c7c7c..10af760e32 100644
--- a/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/SmBiosCpu/Strings.uni
+++ b/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/SmBiosCpu/Strings.uni