diff options
| author | Edward O'Callaghan <quasisec@google.com> | 2022-12-20 12:33:13 +1100 |
|---|---|---|
| committer | Thomas Heijligen <src@posteo.de> | 2023-03-03 17:35:50 +0000 |
| commit | e1f30bbce7a603d518ecec9d7e6885719f396719 (patch) | |
| tree | 8eb630273f026b859d29a9b7854d447cb43c122f /include | |
| parent | c66d2bd1ca384dd673b24420e11865fde86060fc (diff) | |
| download | flashrom-e1f30bbce7a603d518ecec9d7e6885719f396719.tar.gz flashrom-e1f30bbce7a603d518ecec9d7e6885719f396719.tar.bz2 flashrom-e1f30bbce7a603d518ecec9d7e6885719f396719.zip | |
tree/: Drop default_spi_probe_opcode for NULL case
A NULL func pointer is necessary and sufficient for the
condition `NULL func pointer => true' as to not need this
boilerplate as it implies default behaviour of a supported
opcode within the `check_block_eraser()` match supported loop.
Ran;
```
$ find . -name '*.[c,h]' -exec sed -i '/.probe_opcode = default_spi_probe_opcode,/d' '{}' \;
```
Change-Id: Id502c5d2596ad1db52faf05723083620e4c52c12
Signed-off-by: Edward O'Callaghan <quasisec@google.com>
Reviewed-on: https://review.coreboot.org/c/flashrom/+/70264
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Thomas Heijligen <src@posteo.de>
Reviewed-by: Anastasia Klimchuk <aklm@chromium.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/chipdrivers.h | 1 | ||||
| -rw-r--r-- | include/programmer.h | 3 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/chipdrivers.h b/include/chipdrivers.h index 71b87954..c485aafa 100644 --- a/include/chipdrivers.h +++ b/include/chipdrivers.h @@ -26,6 +26,7 @@ int spi_aai_write(struct flashctx *flash, const uint8_t *buf, unsigned int start, unsigned int len); int spi_chip_write_256(struct flashctx *flash, const uint8_t *buf, unsigned int start, unsigned int len); int spi_chip_read(struct flashctx *flash, uint8_t *buf, unsigned int start, int unsigned len); +bool spi_probe_opcode(const struct flashctx *flash, uint8_t opcode); /* spi25.c */ int probe_spi_rdid(struct flashctx *flash); diff --git a/include/programmer.h b/include/programmer.h index f6bc8ce6..d8d8b4a2 100644 --- a/include/programmer.h +++ b/include/programmer.h @@ -312,7 +312,7 @@ struct spi_master { int (*write_256)(struct flashctx *flash, const uint8_t *buf, unsigned int start, unsigned int len); int (*write_aai)(struct flashctx *flash, const uint8_t *buf, unsigned int start, unsigned int len); int (*shutdown)(void *data); - bool (*probe_opcode)(const struct flashctx *flash, uint8_t opcode); + bool (*probe_opcode)(const struct flashctx *flash, uint8_t opcode); /* NULL func implies true. */ void (*delay) (const struct flashctx *flash, unsigned int usecs); void (*get_region)(const struct flashctx *flash, unsigned int addr, struct flash_region *region); void *data; @@ -321,7 +321,6 @@ struct spi_master { int default_spi_read(struct flashctx *flash, uint8_t *buf, unsigned int start, unsigned int len); int default_spi_write_256(struct flashctx *flash, const uint8_t *buf, unsigned int start, unsigned int len); int default_spi_write_aai(struct flashctx *flash, const uint8_t *buf, unsigned int start, unsigned int len); -bool default_spi_probe_opcode(const struct flashctx *flash, uint8_t opcode); int register_spi_master(const struct spi_master *mst, void *data); /* The following enum is needed by ich_descriptor_tool and ich* code as well as in chipset_enable.c. */ |