flash/nor: update cc3220sf for issue found in code review

Remove inappropriate use of bank_number.

Change-Id: I11be1f2540cb09a3ccede35312f90bc8276af338
Signed-off-by: Edward Fewell <efewell@ti.com>
Reviewed-on: http://openocd.zylin.com/4788
Tested-by: jenkins
Reviewed-by: Tomas Vanek <vanekt@fbl.cz>

diff --git a/src/flash/nor/cc3220sf.c b/src/flash/nor/cc3220sf.c
index 5ccb428a89b8e9ebf7f6c059c5e502a088128f93..244112467a0204efa8c77cfb88c446aa20a59305 100644 (file)
--- a/src/flash/nor/cc3220sf.c
+++ b/src/flash/nor/cc3220sf.c
@@ -430,18 +430,10 @@ static int cc3220sf_probe(struct flash_bank *bank)
        uint32_t base;
        uint32_t size;
        int num_sectors;
        uint32_t base;
        uint32_t size;
        int num_sectors;

-       int bank_id;

 
 

-       bank_id = bank->bank_number;
-
-       if (0 == bank_id) {
-               base = FLASH_BASE_ADDR;
-               size = FLASH_NUM_SECTORS * FLASH_SECTOR_SIZE;
-               num_sectors = FLASH_NUM_SECTORS;
-       } else {
-               /* Invalid bank number somehow */
-               return ERROR_FAIL;
-       }
+       base = FLASH_BASE_ADDR;
+       size = FLASH_NUM_SECTORS * FLASH_SECTOR_SIZE;
+       num_sectors = FLASH_NUM_SECTORS;

 
        if (NULL != bank->sectors) {
                free(bank->sectors);
 
        if (NULL != bank->sectors) {
                free(bank->sectors);


@@ -479,11 +471,6 @@ static int cc3220sf_auto_probe(struct flash_bank *bank)
 
        int retval = ERROR_OK;
 
 
        int retval = ERROR_OK;
 

-       if (0 != bank->bank_number) {
-               /* Invalid bank number somehow */
-               return ERROR_FAIL;
-       }
-

        if (!cc3220sf_bank->probed)
                retval = cc3220sf_probe(bank);
 
        if (!cc3220sf_bank->probed)
                retval = cc3220sf_probe(bank);