Edward O'Callaghan has uploaded this change for review.

View Change

chipdrivers: Rename s/erase_block_jedec/jedec_block_erase

Change-Id: I8e7b51f6e78fc5a4c88a1b8dcb24ef82b1f657b8
Signed-off-by: Edward O'Callaghan <quasisec@google.com>
---
M flashrom.c
M include/chipdrivers.h
M jedec.c
3 files changed, 15 insertions(+), 5 deletions(-)

git pull ssh://review.coreboot.org:29418/flashrom refs/changes/50/69050/1

diff --git a/flashrom.c b/flashrom.c
index 6c9dbd0..c0a9f9d 100644
--- a/flashrom.c
+++ b/flashrom.c
@@ -359,7 +359,7 @@
 		case S25FL_BLOCK_ERASE: return &s25fl_block_erase;
 		case S25FS_BLOCK_ERASE_D8: return &s25fs_block_erase_d8;
 		case JEDEC_SECTOR_ERASE: return &erase_sector_jedec; // TODO rename to &jedec_sector_erase;
-		case JEDEC_BLOCK_ERASE: return &erase_block_jedec; // TODO rename to &jedec_block_erase;
+		case JEDEC_BLOCK_ERASE: return &jedec_block_erase;
 		case JEDEC_CHIP_BLOCK_ERASE: return &jedec_chip_block_erase;
 		case OPAQUE_ERASE: return &opqaue_erase;
 		case SPI_ERASE_AT45CS_SECTOR: return &spi_erase_at45cs_sector;
diff --git a/include/chipdrivers.h b/include/chipdrivers.h
index 6c27cb3..93368bb 100644
--- a/include/chipdrivers.h
+++ b/include/chipdrivers.h
@@ -147,7 +147,7 @@
 int write_jedec(struct flashctx *flash, const uint8_t *buf, unsigned int start, unsigned int len);
 int write_jedec_1(struct flashctx *flash, const uint8_t *buf, unsigned int start, unsigned int len);
 int erase_sector_jedec(struct flashctx *flash, unsigned int page, unsigned int pagesize);
-int erase_block_jedec(struct flashctx *flash, unsigned int page, unsigned int blocksize);
+int jedec_block_erase(struct flashctx *flash, unsigned int page, unsigned int blocksize);
 int jedec_chip_block_erase(struct flashctx *flash, unsigned int page, unsigned int blocksize);
 
 int unlock_regspace2_uniform_32k(struct flashctx *flash);
diff --git a/jedec.c b/jedec.c
index 5cba398..b31d6c5 100644
--- a/jedec.c
+++ b/jedec.c
@@ -313,7 +313,7 @@
 	return 0;
 }
 
-static int erase_block_jedec_common(struct flashctx *flash, unsigned int block,
+static int jedec_block_erase_common(struct flashctx *flash, unsigned int block,
 				    unsigned int blocksize, unsigned int mask)
 {
 	chipaddr bios = flash->virtual_memory;
@@ -546,13 +546,13 @@
 	return erase_sector_jedec_common(flash, page, size, mask);
 }
 
-int erase_block_jedec(struct flashctx *flash, unsigned int page,
+int jedec_block_erase(struct flashctx *flash, unsigned int page,
 		      unsigned int size)
 {
 	unsigned int mask;
 
 	mask = getaddrmask(flash->chip);
-	return erase_block_jedec_common(flash, page, size, mask);
+	return jedec_block_erase_common(flash, page, size, mask);
 }
 
 struct unlockblock {

To view, visit change 69050. To unsubscribe, or for help writing mail filters, visit settings.