From 7538d53684792266c37e91f11a3ce2b7fb1e32d9 Mon Sep 17 00:00:00 2001
From: jljusten <jljusten@6f19259b-4bc3-4df7-8a09-765794883524>
Date: Mon, 31 Oct 2011 15:58:05 +0000
Subject: MdeModulePkg: Remove variables that are set, but not used

GCC 4.6 generates a warning when a variable is set,
but never used.

Signed-off-by: jljusten
Reviewed-by: lgao4
Reviewed-by: erictian
Reviewed-by: rsun3

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@12617 6f19259b-4bc3-4df7-8a09-765794883524
---
 MdeModulePkg/Bus/Pci/EhciPei/EhciSched.c | 20 +++++++++-----------
 MdeModulePkg/Bus/Pci/XhciDxe/Xhci.c      | 10 +++++-----
 MdeModulePkg/Bus/Pci/XhciDxe/XhciSched.c |  5 +----
 3 files changed, 15 insertions(+), 20 deletions(-)

(limited to 'MdeModulePkg/Bus/Pci')

diff --git a/MdeModulePkg/Bus/Pci/EhciPei/EhciSched.c b/MdeModulePkg/Bus/Pci/EhciPei/EhciSched.c
index d153aa39dc..8e9dad12d2 100644
--- a/MdeModulePkg/Bus/Pci/EhciPei/EhciSched.c
+++ b/MdeModulePkg/Bus/Pci/EhciPei/EhciSched.c
@@ -2,7 +2,7 @@
 PEIM to produce gPeiUsb2HostControllerPpiGuid based on gPeiUsbControllerPpiGuid
 which is used to enable recovery function from USB Drivers.
 
-Copyright (c) 2010, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2010 - 2011, Intel Corporation. All rights reserved.<BR>
   
 This program and the accompanying materials
 are licensed and made available under the terms and conditions
@@ -264,7 +264,6 @@ EhcUnlinkQhFromAsync (
   )
 {
   PEI_EHC_QH              *Head;
-  EFI_STATUS              Status;
 
   ASSERT (Ehc->ReclaimHead->NextQh == Qh);
 
@@ -283,7 +282,7 @@ EhcUnlinkQhFromAsync (
   //
   // Set and wait the door bell to synchronize with the hardware
   //
-  Status = EhcSetAndWaitDoorBell (Ehc, EHC_GENERIC_TIMEOUT);
+  EhcSetAndWaitDoorBell (Ehc, EHC_GENERIC_TIMEOUT);
   
   return;
 }
@@ -804,8 +803,7 @@ EhcMoniteAsyncRequests (
   BOOLEAN                 Finished;
   UINT8                   *ProcBuf;
   PEI_URB                 *Urb;
-  EFI_STATUS              Status;
-  UINTN               PageNumber;
+  UINTN                   PageNumber;
 
   Ehc     = (PEI_USB2_HC_DEV *) Context;
 
@@ -826,7 +824,7 @@ EhcMoniteAsyncRequests (
     // Flush any PCI posted write transactions from a PCI host 
     // bridge to system memory.
     //
-    Status = EhcFlushAsyncIntMap (Ehc, Urb);
+    EhcFlushAsyncIntMap (Ehc, Urb);
     
     //
     // Allocate a buffer then copy the transferred data for user.
@@ -838,11 +836,11 @@ EhcMoniteAsyncRequests (
     if (Urb->Result == EFI_USB_NOERROR) {
       ASSERT (Urb->Completed <= Urb->DataLen);
       PageNumber =  Urb->Completed/PAGESIZE +1;
-      Status = PeiServicesAllocatePages (
-                 EfiBootServicesCode,
-                 PageNumber,
-                 (EFI_PHYSICAL_ADDRESS *)ProcBuf
-                 );
+      PeiServicesAllocatePages (
+        EfiBootServicesCode,
+        PageNumber,
+        (EFI_PHYSICAL_ADDRESS *)ProcBuf
+        );
       if (ProcBuf == NULL) {
         EhcUpdateAsyncRequest (Urb);
         continue;
diff --git a/MdeModulePkg/Bus/Pci/XhciDxe/Xhci.c b/MdeModulePkg/Bus/Pci/XhciDxe/Xhci.c
index bbde0ca0b7..5ccb78e55b 100644
--- a/MdeModulePkg/Bus/Pci/XhciDxe/Xhci.c
+++ b/MdeModulePkg/Bus/Pci/XhciDxe/Xhci.c
@@ -973,16 +973,16 @@ XhcControlTransfer (
       //
       // For super speed hub, its bit10~12 presents the attached device speed.
       //
-      if ((*(UINT32 *)Data & XHC_PORTSC_PS) >> 10 == 0) {
+      if ((State & XHC_PORTSC_PS) >> 10 == 0) {
         PortStatus.PortStatus |= USB_PORT_STAT_SUPER_SPEED;
       }
     } else if (DeviceSpeed == EFI_USB_SPEED_HIGH) {
       //
       // For high speed hub, its bit9~10 presents the attached device speed.
       //
-      if (XHC_BIT_IS_SET (*(UINT32 *)Data, BIT9)) {
+      if (XHC_BIT_IS_SET (State, BIT9)) {
         PortStatus.PortStatus |= USB_PORT_STAT_LOW_SPEED;
-      } else if (XHC_BIT_IS_SET (*(UINT32 *)Data, BIT10)) {
+      } else if (XHC_BIT_IS_SET (State, BIT10)) {
         PortStatus.PortStatus |= USB_PORT_STAT_HIGH_SPEED;
       }
     } else {
@@ -994,14 +994,14 @@ XhcControlTransfer (
     //
     MapSize = sizeof (mUsbPortStateMap) / sizeof (USB_PORT_STATE_MAP);
     for (Index = 0; Index < MapSize; Index++) {
-      if (XHC_BIT_IS_SET (*(UINT32 *)Data, mUsbPortStateMap[Index].HwState)) {
+      if (XHC_BIT_IS_SET (State, mUsbPortStateMap[Index].HwState)) {
         PortStatus.PortStatus = (UINT16) (PortStatus.PortStatus | mUsbPortStateMap[Index].UefiState);
       }
     }
     MapSize = sizeof (mUsbPortChangeMap) / sizeof (USB_PORT_STATE_MAP);
 
     for (Index = 0; Index < MapSize; Index++) {
-      if (XHC_BIT_IS_SET (*(UINT32 *)Data, mUsbPortChangeMap[Index].HwState)) {
+      if (XHC_BIT_IS_SET (State, mUsbPortChangeMap[Index].HwState)) {
       PortStatus.PortChangeStatus = (UINT16) (PortStatus.PortChangeStatus | mUsbPortChangeMap[Index].UefiState);
       }
     }
diff --git a/MdeModulePkg/Bus/Pci/XhciDxe/XhciSched.c b/MdeModulePkg/Bus/Pci/XhciDxe/XhciSched.c
index 6745d2f81a..49cc2619eb 100644
--- a/MdeModulePkg/Bus/Pci/XhciDxe/XhciSched.c
+++ b/MdeModulePkg/Bus/Pci/XhciDxe/XhciSched.c
@@ -181,6 +181,7 @@ XhcCreateUrb (
   Urb->Context  = Context;
 
   Status = XhcCreateTransferTrb (Xhc, Urb);
+  ASSERT_EFI_ERROR (Status);
 
   return Urb;
 }
@@ -740,13 +741,11 @@ XhcFreeEventRing (
   EVENT_RING_SEG_TABLE_ENTRY    *TablePtr;
   VOID                          *RingBuf;
   EVENT_RING_SEG_TABLE_ENTRY    *EventRingPtr;
-  UINTN                         InterrupterTarget;
 
   if(EventRing->EventRingSeg0 == NULL) {
     return EFI_SUCCESS;
   }
 
-  InterrupterTarget = EventRing->EventInterrupter;
   //
   // Get the Event Ring Segment Table base address
   //
@@ -1048,12 +1047,10 @@ XhciDelAsyncIntTransfer (
   LIST_ENTRY              *Next;
   URB                     *Urb;
   EFI_USB_DATA_DIRECTION  Direction;
-  BOOLEAN                 Found;
 
   Direction = ((EpNum & 0x80) != 0) ? EfiUsbDataIn : EfiUsbDataOut;
   EpNum    &= 0x0F;
 
-  Found = FALSE;
   Urb   = NULL;
 
   EFI_LIST_FOR_EACH_SAFE (Entry, Next, &Xhc->AsyncIntTransfers) {
-- 
cgit v1.2.3