[coreboot-gerrit] Change in coreboot[master]: drivers/mrc_cache: Avoid unused variable assignment

[Patrick Georgi (Code Review)]

Patrick Georgi has submitted this change. ( https://review.coreboot.org/c/coreboot/+/42798 )

Change subject: drivers/mrc_cache: Avoid unused variable assignment
......................................................................

drivers/mrc_cache: Avoid unused variable assignment

Fix the scan-build warning below:

CC         romstage/drivers/mrc_cache/mrc_cache.o
    src/drivers/mrc_cache/mrc_cache.c:450:26: warning: Value stored to 'flash' during its initialization is never read
            const struct spi_flash *flash = boot_device_spi_flash();
                                    ^~~~~   ~~~~~~~~~~~~~~~~~~~~~~~
    1 warning generated.

The function can return early before the value is read. Fix this, by
getting rid of the variable, as the value is only read once.

Change-Id: I3c94b123f4994eed9d7568b63971fd5b1d94bc09
Found-by: scan-build (clang-tools-9 1:9.0.1-12)
Signed-off-by: Paul Menzel 
Reviewed-on: https://review.coreboot.org/c/coreboot/+/42798
Tested-by: build bot (Jenkins) 
Reviewed-by: Patrick Rudolph 
---
M src/drivers/mrc_cache/mrc_cache.c
1 file changed, 1 insertion(+), 3 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Patrick Rudolph: Looks good to me, approved

diff --git a/src/drivers/mrc_cache/mrc_cache.c b/src/drivers/mrc_cache/mrc_cache.c
index 3a005db..d567a20 100644
--- a/src/drivers/mrc_cache/mrc_cache.c
+++ b/src/drivers/mrc_cache/mrc_cache.c
@@ -447,15 +447,13 @@
 /* Apply protection to a range of flash */
 static int nvm_protect(const struct region *r)
 {
-	const struct spi_flash *flash = boot_device_spi_flash();
-
    if (!CONFIG(MRC_SETTINGS_PROTECT))
    	return 0;

if (!CONFIG(BOOT_DEVICE_SPI_FLASH))
    	return 0;

-	return spi_flash_ctrlr_protect_region(flash, r, WRITE_PROTECT);
+	return spi_flash_ctrlr_protect_region(boot_device_spi_flash(), r, WRITE_PROTECT);
 }

/* Protect mrc region with a Protected Range Register */