spi25.c: Rename spi_get_erasefn_from_opcode to spi25_get_erasefn_from…

…_opcode This function works only with spi25 chips Change-Id: Ie054160b0fdd34bcb128285c6a047e3a3fa8be0c Signed-off-by: Thomas Heijligen <[email protected]> Reviewed-on: https://review.coreboot.org/c/flashrom/+/67716 Reviewed-by: Thomas Heijligen <[email protected]> Reviewed-by: Edward O'Callaghan <[email protected]> Tested-by: build bot (Jenkins) <[email protected]>
therealdreg · Dec 14, 2022 · d1e97db · d1e97db
1 parent cb99e8a
commit d1e97db
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/include/chipdrivers.h b/include/chipdrivers.h
@@ -52,7 +52,7 @@ int spi_block_erase_d7(struct flashctx *flash, unsigned int addr, unsigned int b
 int spi_block_erase_d8(struct flashctx *flash, unsigned int addr, unsigned int blocklen);
 int spi_block_erase_db(struct flashctx *flash, unsigned int addr, unsigned int blocklen);
 int spi_block_erase_dc(struct flashctx *flash, unsigned int addr, unsigned int blocklen);
-enum block_erase_func spi_get_erasefn_from_opcode(uint8_t opcode);
+enum block_erase_func spi25_get_erasefn_from_opcode(uint8_t opcode);
 uint8_t spi_get_opcode_from_erasefn(enum block_erase_func func);
 int spi_chip_write_1(struct flashctx *flash, const uint8_t *buf, unsigned int start, unsigned int len);
 int spi_nbyte_read(struct flashctx *flash, unsigned int addr, uint8_t *bytes, unsigned int len);

diff --git a/sfdp.c b/sfdp.c
@@ -81,7 +81,7 @@ static int sfdp_add_uniform_eraser(struct flashchip *chip, uint8_t opcode, uint3
 {
  int i;
  uint32_t total_size = chip->total_size * 1024;
- enum block_erase_func erasefn = spi_get_erasefn_from_opcode(opcode);
+ enum block_erase_func erasefn = spi25_get_erasefn_from_opcode(opcode);
 
  if (erasefn == NO_BLOCK_ERASE_FUNC || total_size == 0 || block_size == 0 ||
  total_size % block_size != 0) {

diff --git a/spi25.c b/spi25.c
@@ -621,7 +621,7 @@ int spi_block_erase_dc(struct flashctx *flash, unsigned int addr, unsigned int b
 static const struct {
  enum block_erase_func func;
  uint8_t opcode;
-} function_opcode_list[] = {
+} spi25_function_opcode_list[] = {
  {SPI_BLOCK_ERASE_20, 0x20},
  {SPI_BLOCK_ERASE_21, 0x21},
  {SPI_BLOCK_ERASE_50, 0x50},
@@ -639,12 +639,12 @@ static const struct {
  {SPI_BLOCK_ERASE_DC, 0xdc},
 };
 
-enum block_erase_func spi_get_erasefn_from_opcode(uint8_t opcode)
+enum block_erase_func spi25_get_erasefn_from_opcode(uint8_t opcode)
 {
  size_t i;
- for (i = 0; i < ARRAY_SIZE(function_opcode_list); i++) {
- if (function_opcode_list[i].opcode == opcode)
- return function_opcode_list[i].func;
+ for (i = 0; i < ARRAY_SIZE(spi25_function_opcode_list); i++) {
+ if (spi25_function_opcode_list[i].opcode == opcode)
+ return spi25_function_opcode_list[i].func;
  }
  msg_cinfo("%s: unknown erase opcode (0x%02x). Please report "
  "this at [email protected]\n", __func__, opcode);