public inbox for devel@edk2.groups.io
 help / color / mirror / Atom feed
From: Ryszard Knop <ryszard.knop@linux.intel.com>
To: Ard Biesheuvel <ard.biesheuvel@linaro.org>, edk2-devel@lists.01.org
Cc: kamil.kacperski@intel.com, eric.jin@intel.com,
	pawel.orlowski@intel.com, michael.d.kinney@intel.com,
	harry.l.hsiung@intel.com
Subject: Re: [PATCH edk2-staging 19/19] IntelUndiPkg/GigUndiDxe: remove or reorganize unused variables
Date: Wed, 30 Jan 2019 15:32:42 +0100	[thread overview]
Message-ID: <1d309dc9fa35797d8324fc35e6e641837f467df2.camel@linux.intel.com> (raw)
In-Reply-To: <20181106175833.26964-20-ard.biesheuvel@linaro.org>

Just one thing - in E1000Receive, the removed Status is actually
needed, we've missed the error handling block in 1G while backporting
DMA changes from 40G drivers.

Reviewed-by: Ryszard Knop <ryszard.knop@linux.intel.com>

On Tue, 2018-11-06 at 18:58 +0100, ard.biesheuvela wrote:
> Drop variables that are assigned but never used, or move them into
> a conditional preprocessor block if the only references occur from
> such code.
> 
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Ard Biesheuvel <ard.biesheuvel at linaro.org>
> ---
>  IntelUndiPkg/GigUndiDxe/DriverDiagnostics.c |  2 --
>  IntelUndiPkg/GigUndiDxe/HiiInternalLib.c    |  2 --
>  IntelUndiPkg/GigUndiDxe/e1000.c             | 16 +++++++---------
>  3 files changed, 7 insertions(+), 13 deletions(-)
> 
> diff --git a/IntelUndiPkg/GigUndiDxe/DriverDiagnostics.c
> b/IntelUndiPkg/GigUndiDxe/DriverDiagnostics.c
> index f6152cd24c59..af8aaa797e68 100644
> --- a/IntelUndiPkg/GigUndiDxe/DriverDiagnostics.c
> +++ b/IntelUndiPkg/GigUndiDxe/DriverDiagnostics.c
> @@ -1123,11 +1123,9 @@ GigUndiRunPhyLoopback (
>    UINT64           FreeTxBuffer[DEFAULT_TX_DESCRIPTORS];
>    UINT32           j;
>    UINT32           i;
> -  struct e1000_hw *Hw;
>  
>    Status  = EFI_SUCCESS;
>    j       = 0;
> -  Hw = &GigAdapterInfo->Hw;
>  
>    while (j < PHY_LOOPBACK_ITERATIONS) {
>      Status = E1000Transmit (
> diff --git a/IntelUndiPkg/GigUndiDxe/HiiInternalLib.c
> b/IntelUndiPkg/GigUndiDxe/HiiInternalLib.c
> index 2aacb63ca158..690d8314be74 100644
> --- a/IntelUndiPkg/GigUndiDxe/HiiInternalLib.c
> +++ b/IntelUndiPkg/GigUndiDxe/HiiInternalLib.c
> @@ -197,7 +197,6 @@ GetNextRequestElement (
>    )
>  {
>    EFI_STRING StringPtr;
> -  EFI_STRING TmpPtr;
>    EFI_STATUS Status;
>    UINTN      Length;
>    UINT8 *    TmpBuffer;
> @@ -227,7 +226,6 @@ GetNextRequestElement (
>    }
>  
>    // Back up the header of one <BlockName>
> -  TmpPtr = StringPtr;
>  
>    StringPtr += StrLen (L"OFFSET=");
>  
> diff --git a/IntelUndiPkg/GigUndiDxe/e1000.c
> b/IntelUndiPkg/GigUndiDxe/e1000.c
> index 28c900e3ad63..3d4a21c62d77 100644
> --- a/IntelUndiPkg/GigUndiDxe/e1000.c
> +++ b/IntelUndiPkg/GigUndiDxe/e1000.c
> @@ -412,7 +412,6 @@ E1000Transmit (
>    E1000_TRANSMIT_DESCRIPTOR  *TransmitDescriptor;
>    UINT32                      i;
>    INT16                       WaitMsec;
> -  EFI_STATUS                  Status;
>    UNDI_DMA_MAPPING            *TxBufMapping;
>  
>    TxBufMapping = &GigAdapter->TxBufferMappings[GigAdapter-
> >CurTxInd];
> @@ -483,7 +482,7 @@ E1000Transmit (
>      TxBufMapping->Size = TxBuffer->DataLen + TxBuffer-
> >MediaheaderLen;
>  
>      // Make the Tx buffer accessible for adapter over DMA
> -    Status = UndiDmaMapMemoryRead (
> +    UndiDmaMapMemoryRead (
>                 GigAdapter->PciIo,
>                 TxBufMapping
>                 );
> @@ -594,20 +593,21 @@ E1000Receive (
>    E1000_RECEIVE_DESCRIPTOR *ReceiveDescriptor;
>    ETHER_HEADER *            EtherHeader;
>    PXE_STATCODE              StatCode;
> -  UINT16                    i;
>    UINT16                    TempLen;
> +#if (DBG_LVL & RX)
> +  UINT16                    i;
>    UINT8 *                   PacketPtr;
>  #if (DBG_LVL & CRITICAL)
> -#if (DBG_LVL & RX)
>    UINT32 Rdh;
>    UINT32 Rdt;
> -#endif /* (DBG_LVL & RX) */
> +
>  #endif /* (DBG_LVL & CRITICAL) */
> +  i           = 0;
> +#endif /* (DBG_LVL & RX) */
>  
>  
>    PacketType  = PXE_FRAME_TYPE_NONE;
>    StatCode    = PXE_STATCODE_NO_DATA;
> -  i           = 0;
>  
>    // acknowledge the interrupts
>    E1000_READ_REG (&GigAdapter->Hw, E1000_ICR);
> @@ -679,9 +679,9 @@ E1000Receive (
>          TempLen
>        );
>  
> +#if (DBG_LVL & RX)
>        PacketPtr = (UINT8 *) (UINTN) CpbReceive->BufferAddr;
>  
> -#if (DBG_LVL & RX)
>        DEBUGPRINT (RX, ("Packet Data \n"));
>        for (i = 0; i < TempLen; i++) {
>          DEBUGPRINT (RX, ("%x ", PacketPtr[i]));
> @@ -1569,13 +1569,11 @@ E1000Inititialize (
>    GIG_DRIVER_DATA *GigAdapter
>    )
>  {
> -  UINT32 *     TempBar;
>    PXE_STATCODE PxeStatcode;
>  
>    DEBUGPRINT (E1000, ("E1000Inititialize\n"));
>  
>    PxeStatcode = PXE_STATCODE_SUCCESS;
> -  TempBar = NULL;
>  
>    ZeroMem (
>      (VOID *)(UINTN)GigAdapter->RxRing.UnmappedAddress,



  parent reply	other threads:[~2019-01-30 14:32 UTC|newest]

Thread overview: 67+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-11-06 17:58 [PATCH edk2-staging 00/19] IntelUndiPkg/GigUndiDxe: build fixes for AARCH64/ARM/GCC Ard Biesheuvel
2018-11-06 17:58 ` [PATCH edk2-staging 01/19] IntelOpenSourceUndiPkg.dsc: add AARCH64 and ARM to supported architectures Ard Biesheuvel
2019-01-29 13:54   ` Ryszard Knop
2019-01-29 14:04     ` Ard Biesheuvel
2018-11-06 17:58 ` [PATCH edk2-staging 02/19] IntelUndiPkg: remove EOF markers Ard Biesheuvel
2018-11-06 19:34   ` Philippe Mathieu-Daudé
2019-01-29 13:58   ` Ryszard Knop
2018-11-06 17:58 ` [PATCH edk2-staging 03/19] IntelUndiPkg/GigUndiDxe: consistently use lowercase for e1000 in filenames Ard Biesheuvel
2018-11-06 19:35   ` Philippe Mathieu-Daudé
2019-01-29 14:21   ` Ryszard Knop
2018-11-06 17:58 ` [PATCH edk2-staging 04/19] IntelUndiPkg/GigUndiDxe: consistently use forward slashes as path separators Ard Biesheuvel
2018-11-06 19:37   ` Philippe Mathieu-Daudé
2019-01-29 14:26   ` Ryszard Knop
2018-11-06 17:58 ` [PATCH edk2-staging 05/19] IntelUndiPkg/GigUndiDxe: move BRAND_STRUCT declaration after type definition Ard Biesheuvel
2019-01-29 16:02   ` Ryszard Knop
2018-11-06 17:58 ` [PATCH edk2-staging 06/19] IntelUndiPkg/GigUndiDxe: use intermediate UINTN casts for pointers Ard Biesheuvel
2019-01-30 10:59   ` Ryszard Knop
2018-11-06 17:58 ` [PATCH edk2-staging 07/19] IntelUndiPkg/GigUndiDxe: create GCC alternatives for MSFT build options Ard Biesheuvel
2019-01-30 11:48   ` Ryszard Knop
2018-11-06 17:58 ` [PATCH edk2-staging 08/19] IntelUndiPkg/GigUndiDxe: add missing VOID** cast Ard Biesheuvel
2018-11-07  9:16   ` Philippe Mathieu-Daudé
2018-11-07 14:05   ` Philippe Mathieu-Daudé
2019-01-30 12:05   ` Ryszard Knop
2018-11-06 17:58 ` [PATCH edk2-staging 09/19] IntelUndiPkg/GigUndiDxe: add missing UINT8* cast Ard Biesheuvel
2018-11-06 20:31   ` Philippe Mathieu-Daudé
2018-11-06 20:35     ` Ard Biesheuvel
2018-11-07  9:08       ` Philippe Mathieu-Daudé
2019-01-30 12:37     ` Ryszard Knop
2019-01-30 12:30   ` Ryszard Knop
2018-11-06 17:58 ` [PATCH edk2-staging 10/19] IntelUndiPkg/GigUndiDxe: add missing braces to GUID literals Ard Biesheuvel
2018-11-06 20:34   ` Philippe Mathieu-Daudé
2019-01-30 12:59   ` Ryszard Knop
2018-11-06 17:58 ` [PATCH edk2-staging 11/19] IntelUndiPkg/GigUndiDxe: fix incorrect use of CPP token pasting Ard Biesheuvel
2019-01-30 13:35   ` Ryszard Knop
2018-11-06 17:58 ` [PATCH edk2-staging 12/19] IntelUndiPkg/GigUndiDxe: cast E1000MemCopy () args to correct pointer type Ard Biesheuvel
2018-11-06 20:35   ` Philippe Mathieu-Daudé
2019-01-30 13:37   ` Ryszard Knop
2018-11-06 17:58 ` [PATCH edk2-staging 13/19] IntelUndiPkg/GigUndiDxe: don't take address of cast expression Ard Biesheuvel
2018-11-06 20:36   ` Philippe Mathieu-Daudé
2019-01-30 13:41   ` Ryszard Knop
2018-11-06 17:58 ` [PATCH edk2-staging 14/19] IntelUndiPkg/GigUndiDxe: redefine UNREFERENCED_nPARAMETER macros for GCC Ard Biesheuvel
2018-11-06 17:58 ` [PATCH edk2-staging 15/19] IntelUndiPkg/GigUndiDxe: remove forward declaration of non-existent function Ard Biesheuvel
2018-11-06 20:40   ` Philippe Mathieu-Daudé
2019-01-30 15:26   ` Ryszard Knop
2018-11-06 17:58 ` [PATCH edk2-staging 16/19] IntelUndiPkg/GigUndiDxe: fix incorrect indentation Ard Biesheuvel
2018-11-06 20:41   ` Philippe Mathieu-Daudé
2018-11-06 17:58 ` [PATCH edk2-staging 17/19] IntelUndiPkg/GigUndiDxe: move MSFT warning overrides to INF file Ard Biesheuvel
2019-01-30 14:09   ` Ryszard Knop
2018-11-06 17:58 ` [PATCH edk2-staging 18/19] IntelUndiPkg/GigUndiDxe: add missing EFIAPI modifiers Ard Biesheuvel
2019-01-30 15:15   ` Ryszard Knop
2019-01-30 15:20     ` Ard Biesheuvel
2019-01-30 15:31       ` Ryszard Knop
2019-01-30 15:33         ` Ard Biesheuvel
2018-11-06 17:58 ` [PATCH edk2-staging 19/19] IntelUndiPkg/GigUndiDxe: remove or reorganize unused variables Ard Biesheuvel
2018-11-07  9:08   ` Philippe Mathieu-Daudé
2019-01-30 14:32   ` Ryszard Knop [this message]
2018-11-06 22:10 ` [PATCH edk2-staging 00/19] IntelUndiPkg/GigUndiDxe: build fixes for AARCH64/ARM/GCC Kinney, Michael D
2018-11-06 23:03   ` Ard Biesheuvel
2018-11-09 17:54     ` Knop, Ryszard
2018-11-09 18:00       ` Ard Biesheuvel
2018-11-07 14:56   ` Leif Lindholm
2019-01-29 13:13 ` Ryszard Knop
2019-01-29 13:55   ` Ryszard Knop
2019-03-27 15:32     ` Ard Biesheuvel
2019-03-28 10:46       ` Ryszard Knop
2019-03-28 11:38         ` Ard Biesheuvel
2020-01-07 12:49           ` [edk2-devel] " Maciej Rabeda

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-list from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1d309dc9fa35797d8324fc35e6e641837f467df2.camel@linux.intel.com \
    --to=devel@edk2.groups.io \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox