38 lines
1.3 KiB
Diff
38 lines
1.3 KiB
Diff
From 98b68324f67236e8c9152976535dc1f27fb67ba8 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
|
|
Date: Mon, 8 Mar 2021 10:03:19 +0100
|
|
Subject: [PATCH] firmware: bcm47xx_nvram: look for NVRAM with for instead of
|
|
while
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
This loop requires variable initialization, stop condition and post
|
|
iteration increment. It's pretty much a for loop definition.
|
|
|
|
Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
|
|
Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
|
|
---
|
|
drivers/firmware/broadcom/bcm47xx_nvram.c | 4 +---
|
|
1 file changed, 1 insertion(+), 3 deletions(-)
|
|
|
|
--- a/drivers/firmware/broadcom/bcm47xx_nvram.c
|
|
+++ b/drivers/firmware/broadcom/bcm47xx_nvram.c
|
|
@@ -93,15 +93,13 @@ static int bcm47xx_nvram_find_and_copy(v
|
|
}
|
|
|
|
/* TODO: when nvram is on nand flash check for bad blocks first. */
|
|
- flash_size = FLASH_MIN;
|
|
- while (flash_size <= res_size) {
|
|
+ for (flash_size = FLASH_MIN; flash_size <= res_size; flash_size <<= 1) {
|
|
/* Windowed flash access */
|
|
size = find_nvram_size(flash_start + flash_size);
|
|
if (size) {
|
|
offset = flash_size - size;
|
|
goto found;
|
|
}
|
|
- flash_size <<= 1;
|
|
}
|
|
|
|
/* Try embedded NVRAM at 4 KB and 1 KB as last resorts */
|