flasher: Remove unused blocklevel_get_info

shenki · shenki · commit 61a5fdf09f40 · 2016-11-04T11:08:08.000+10:30
We retrieve the parameters but don't do anything with them.

Change-Id: I5689fb04d6a9f201a6aff6235925b86c77500823
Signed-off-by: Joel Stanley &lt;joel@jms.id.au&gt;
diff --git a/op-flasher/flasher_obj.c b/op-flasher/flasher_obj.c
@@ -50,8 +50,6 @@ static uint8_t file_buf[FILE_BUF_SIZE] __aligned(0x1000);
 
 static struct blocklevel_device *bl;
 static struct ffs_handle	*ffsh;
-static uint32_t			fl_total_size, fl_erase_granule;
-static const char		*fl_name;
 static int32_t			ffs_index = -1;
 
 static uint8_t FLASH_OK = 0;
@@ -246,12 +244,6 @@ flash(FlashControl* flash_control,bool bmc_flash, uint32_t address, char* write_
 		}
 	}
 
-	rc = blocklevel_get_info(bl, &fl_name,
-			&fl_total_size, &fl_erase_granule);
-	if(rc) {
-		fprintf(stderr, "Error %d getting flash info\n", rc);
-		return FLASH_SETUP_ERROR;
-	}
 	if(strcmp(write_file,"")!=0)
 	{
 		// If file specified but not size, get size from file

Original file line number	Diff line number	Diff line change
`@@ -50,8 +50,6 @@ static uint8_t file_buf[FILE_BUF_SIZE] __aligned(0x1000);`
`50`	`50`
`51`	`51`	`static struct blocklevel_device *bl;`
`52`	`52`	`static struct ffs_handle *ffsh;`
`53`		`-static uint32_t fl_total_size, fl_erase_granule;`
`54`		`-static const char *fl_name;`
`55`	`53`	`static int32_t ffs_index = -1;`
`56`	`54`
`57`	`55`	`static uint8_t FLASH_OK = 0;`
`@@ -246,12 +244,6 @@ flash(FlashControl* flash_control,bool bmc_flash, uint32_t address, char* write_`
`246`	`244`	`}`
`247`	`245`	`}`
`248`	`246`
`249`		`- rc = blocklevel_get_info(bl, &fl_name,`
`250`		`- &fl_total_size, &fl_erase_granule);`
`251`		`- if(rc) {`
`252`		`- fprintf(stderr, "Error %d getting flash info\n", rc);`
`253`		`- return FLASH_SETUP_ERROR;`
`254`		`- }`
`255`	`247`	`if(strcmp(write_file,"")!=0)`
`256`	`248`	`{`
`257`	`249`	`// If file specified but not size, get size from file`