Marvell/Drivers: MvFvbDxe: Fix compilation error

[edk2-devel] [PATCH] Marvell/Drivers: MvFvbDxe: Fix compilation error

Posted by Marcin Wojtas 4 years, 12 months ago

Commit cee103d37d6b ("Marvell/Drivers: MvFvbDxe: Introduce non-mmio mode)
introduced a compilation error, visible with certain toolchains.
Fix that.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Marcin Wojtas <mw@semihalf.com>
---
 Silicon/Marvell/Drivers/Spi/MvFvbDxe/MvFvbDxe.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/Silicon/Marvell/Drivers/Spi/MvFvbDxe/MvFvbDxe.c b/Silicon/Marvell/Drivers/Spi/MvFvbDxe/MvFvbDxe.c
index b4fd29c..62f9e57 100644
--- a/Silicon/Marvell/Drivers/Spi/MvFvbDxe/MvFvbDxe.c
+++ b/Silicon/Marvell/Drivers/Spi/MvFvbDxe/MvFvbDxe.c
@@ -1003,7 +1003,6 @@ MvFvbConfigureFlashInstance (
   )
 {
   EFI_STATUS Status;
-  UINTN     *NumBytes;
   UINTN     DataOffset;
   UINTN     VariableSize, FtwWorkingSize, FtwSpareSize, MemorySize;
 
@@ -1080,10 +1079,9 @@ MvFvbConfigureFlashInstance (
     DataOffset = GET_DATA_OFFSET (FlashInstance->FvbOffset,
                    FlashInstance->StartLba,
                    FlashInstance->Media.BlockSize);
-    *NumBytes = FlashInstance->FvbSize;
     Status = FlashInstance->SpiFlashProtocol->Read (&FlashInstance->SpiDevice,
                                                 DataOffset,
-                                                *NumBytes,
+                                                FlashInstance->FvbSize,
                                                 (VOID *)FlashInstance->RegionBaseAddress);
     if (EFI_ERROR (Status)) {
       goto ErrorFreeAllocatedPages;
-- 
2.7.4


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#40218): https://edk2.groups.io/g/devel/message/40218
Mute This Topic: https://groups.io/mt/31549489/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [edk2-devel] [PATCH] Marvell/Drivers: MvFvbDxe: Fix compilation error

Posted by Leif Lindholm 4 years, 11 months ago

On Thu, May 09, 2019 at 01:24:21AM +0200, Marcin Wojtas wrote:
> Commit cee103d37d6b ("Marvell/Drivers: MvFvbDxe: Introduce non-mmio mode)
> introduced a compilation error, visible with certain toolchains.
> Fix that.
> 
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Marcin Wojtas <mw@semihalf.com>

Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org>
Pushed as e284bb9226.
Thanks for quick turnaround.

> ---
>  Silicon/Marvell/Drivers/Spi/MvFvbDxe/MvFvbDxe.c | 4 +---
>  1 file changed, 1 insertion(+), 3 deletions(-)
> 
> diff --git a/Silicon/Marvell/Drivers/Spi/MvFvbDxe/MvFvbDxe.c b/Silicon/Marvell/Drivers/Spi/MvFvbDxe/MvFvbDxe.c
> index b4fd29c..62f9e57 100644
> --- a/Silicon/Marvell/Drivers/Spi/MvFvbDxe/MvFvbDxe.c
> +++ b/Silicon/Marvell/Drivers/Spi/MvFvbDxe/MvFvbDxe.c
> @@ -1003,7 +1003,6 @@ MvFvbConfigureFlashInstance (
>    )
>  {
>    EFI_STATUS Status;
> -  UINTN     *NumBytes;
>    UINTN     DataOffset;
>    UINTN     VariableSize, FtwWorkingSize, FtwSpareSize, MemorySize;
>  
> @@ -1080,10 +1079,9 @@ MvFvbConfigureFlashInstance (
>      DataOffset = GET_DATA_OFFSET (FlashInstance->FvbOffset,
>                     FlashInstance->StartLba,
>                     FlashInstance->Media.BlockSize);
> -    *NumBytes = FlashInstance->FvbSize;
>      Status = FlashInstance->SpiFlashProtocol->Read (&FlashInstance->SpiDevice,
>                                                  DataOffset,
> -                                                *NumBytes,
> +                                                FlashInstance->FvbSize,
>                                                  (VOID *)FlashInstance->RegionBaseAddress);
>      if (EFI_ERROR (Status)) {
>        goto ErrorFreeAllocatedPages;
> -- 
> 2.7.4
> 

-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#40335): https://edk2.groups.io/g/devel/message/40335
Mute This Topic: https://groups.io/mt/31549489/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-