3 files changed, 1 insertions, 8 deletions
diff --git a/EdkCompatibilityPkg/Foundation/Library/Dxe/EfiDriverLib/Perf.c b/EdkCompatibilityPkg/Foundation/Library/Dxe/EfiDriverLib/Perf.c
index b8809d18b6..b5f9a4ae5d 100644
--- a/EdkCompatibilityPkg/Foundation/Library/Dxe/EfiDriverLib/Perf.c
+++ b/EdkCompatibilityPkg/Foundation/Library/Dxe/EfiDriverLib/Perf.c
@@ -515,12 +515,10 @@ Returns:
 
 --*/
 {
-  EFI_PERFORMANCE_INSTANCE  *PerfInstance;
   EFI_PERF_DATA_LIST        *Node;
   UINT64                    TimerValue;
 
   TimerValue    = 0;
-  PerfInstance  = EFI_PERFORMANCE_FROM_THIS (This);
 
   Node          = GetDataNode (Handle, Token, Host, NULL, NULL);
   if (!Node) {
@@ -573,11 +571,8 @@ Returns:
 
 --*/
 {
-  EFI_PERFORMANCE_INSTANCE  *PerfInstance;
   EFI_PERF_DATA_LIST        *Node;
 
-  PerfInstance  = EFI_PERFORMANCE_FROM_THIS (This);
-
   Node          = GetDataNode (Handle, Token, Host, NULL, PrevGauge);
   if (Node != NULL) {
     return &(Node->GaugeData);
diff --git a/EdkCompatibilityPkg/Foundation/Library/EfiCommonLib/LinkedList.c b/EdkCompatibilityPkg/Foundation/Library/EfiCommonLib/LinkedList.c
index 7e9bfa889d..2ba4d1c267 100644
--- a/EdkCompatibilityPkg/Foundation/Library/EfiCommonLib/LinkedList.c
+++ b/EdkCompatibilityPkg/Foundation/Library/EfiCommonLib/LinkedList.c
@@ -212,14 +212,12 @@ Returns:
 
 --*/
 {
-  EFI_LIST_ENTRY *Entry1ForwardLink;
   EFI_LIST_ENTRY *Entry1BackLink;
   EFI_LIST_ENTRY *Entry2ForwardLink;
   EFI_LIST_ENTRY *Entry2BackLink;
 
   Entry2ForwardLink           = Entry2->ForwardLink;          
   Entry2BackLink              = Entry2->BackLink;                
-  Entry1ForwardLink           = Entry1->ForwardLink;          
   Entry1BackLink              = Entry1->BackLink;                
   Entry2BackLink->ForwardLink = Entry2ForwardLink;    
   Entry2ForwardLink->BackLink = Entry2BackLink;       
diff --git a/EdkCompatibilityPkg/Foundation/Library/EfiCommonLib/ReportStatusCode.c b/EdkCompatibilityPkg/Foundation/Library/EfiCommonLib/ReportStatusCode.c
index ce56fcf368..775b7c36b6 100644
--- a/EdkCompatibilityPkg/Foundation/Library/EfiCommonLib/ReportStatusCode.c
+++ b/EdkCompatibilityPkg/Foundation/Library/EfiCommonLib/ReportStatusCode.c
@@ -339,6 +339,6 @@ Returns:
 #else
   *Marker = (VA_LIST) (DebugInfo + 1);
   *Format = (CHAR8 *)(((UINT64 *)*Marker) + 12);
-#endif
   return TRUE;
+#endif
 }