UefiCpuPkg/Application/Cpuid: Remove unnecessary code check

[mirror_edk2.git] / UefiCpuPkg / Application / Cpuid / Cpuid.c

diff --git a/UefiCpuPkg/Application/Cpuid/Cpuid.c b/UefiCpuPkg/Application/Cpuid/Cpuid.c
index f82e43f563ad41f2b5af2e132869c99a8457bb3d..b0624e1c23fde0017c40bbc424cbf61f84f927cd 100644 (file)
--- a/UefiCpuPkg/Application/Cpuid/Cpuid.c
+++ b/UefiCpuPkg/Application/Cpuid/Cpuid.c
@@ -21,7 +21,7 @@
 /// Macro used to display the value of a bit field in a register returned by CPUID.\r
 ///\r
 #define PRINT_BIT_FIELD(Variable, FieldName) \\r
-  Print (L"%5a%42a: %x\n", #Variable, #FieldName, ##Variable.Bits.##FieldName);\r
+  Print (L"%5a%42a: %x\n", #Variable, #FieldName, Variable.Bits.FieldName);\r
 \r
 ///\r
 /// Macro used to display the value of a register returned by CPUID.\r
@@ -179,10 +179,6 @@ CpuidSignature (
   UINT32 Edx;\r
   CHAR8  Signature[13];\r
 \r
-  if (CPUID_SIGNATURE > gMaximumBasicFunction) {\r
-    return;\r
-  }\r
-\r
   AsmCpuid (CPUID_SIGNATURE, &Eax, &Ebx, &Ecx, &Edx);\r
 \r
   Print (L"CPUID_SIGNATURE (Leaf %08x)\n", CPUID_SIGNATURE);\r
@@ -210,8 +206,8 @@ CpuidVersionInfo (
   CPUID_VERSION_INFO_EBX  Ebx;\r
   CPUID_VERSION_INFO_ECX  Ecx;\r
   CPUID_VERSION_INFO_EDX  Edx;\r
-  UINTN                   DisplayFamily;\r
-  UINTN                   DisplayModel;\r
+  UINT32                  DisplayFamily;\r
+  UINT32                  DisplayModel;\r
 \r
   if (CPUID_VERSION_INFO > gMaximumBasicFunction) {\r
     return;\r