Edward O'Callaghan has uploaded this change for review.

View Change

chipdrivers: Rename s/erase_sector_jedec/jedec_sector_erase

Change-Id: Id21d514d6a8701a058287d9dabf9be7b62cfd95f
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/51/69051/1

diff --git a/flashrom.c b/flashrom.c
index c0a9f9d..cad95c8 100644
--- a/flashrom.c
+++ b/flashrom.c
@@ -358,7 +358,7 @@
 		case SPI_BLOCK_ERASE_DC: return &spi_block_erase_dc;
 		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_SECTOR_ERASE: return &jedec_sector_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;
diff --git a/include/chipdrivers.h b/include/chipdrivers.h
index 93368bb..005cc5b 100644
--- a/include/chipdrivers.h
+++ b/include/chipdrivers.h
@@ -146,7 +146,7 @@
 int probe_jedec_29gl(struct flashctx *flash);
 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 jedec_sector_erase(struct flashctx *flash, unsigned int page, unsigned int pagesize);
 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);
 
diff --git a/jedec.c b/jedec.c
index b31d6c5..70cc16b 100644
--- a/jedec.c
+++ b/jedec.c
@@ -281,7 +281,7 @@
 	return 1;
 }
 
-static int erase_sector_jedec_common(struct flashctx *flash, unsigned int page,
+static int jedec_sector_erase_common(struct flashctx *flash, unsigned int page,
 				     unsigned int pagesize, unsigned int mask)
 {
 	chipaddr bios = flash->virtual_memory;
@@ -537,13 +537,13 @@
 	return probe_jedec_common(flash, mask);
 }
 
-int erase_sector_jedec(struct flashctx *flash, unsigned int page,
+int jedec_sector_erase(struct flashctx *flash, unsigned int page,
 		       unsigned int size)
 {
 	unsigned int mask;
 
 	mask = getaddrmask(flash->chip);
-	return erase_sector_jedec_common(flash, page, size, mask);
+	return jedec_sector_erase_common(flash, page, size, mask);
 }
 
 int jedec_block_erase(struct flashctx *flash, unsigned int page,

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