summaryrefslogtreecommitdiffstats
path: root/spi25_statusreg.c
diff options
context:
space:
mode:
authorEdward O'Callaghan <quasisec@google.com>2022-12-20 12:33:13 +1100
committerThomas Heijligen <src@posteo.de>2023-03-03 17:35:50 +0000
commite1f30bbce7a603d518ecec9d7e6885719f396719 (patch)
tree8eb630273f026b859d29a9b7854d447cb43c122f /spi25_statusreg.c
parentc66d2bd1ca384dd673b24420e11865fde86060fc (diff)
downloadflashrom-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 'spi25_statusreg.c')
-rw-r--r--spi25_statusreg.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/spi25_statusreg.c b/spi25_statusreg.c
index ec2c101cf..d452416c7 100644
--- a/spi25_statusreg.c
+++ b/spi25_statusreg.c
@@ -132,7 +132,7 @@ int spi_write_register(const struct flashctx *flash, enum flash_reg reg, uint8_t
return 1;
}
- if (!flash->mst->spi.probe_opcode(flash, write_cmd[0])) {
+ if (!spi_probe_opcode(flash, write_cmd[0])) {
msg_pdbg("%s: write to register %d not supported by programmer, ignoring.\n", __func__, reg);
return SPI_INVALID_OPCODE;
}
@@ -246,7 +246,7 @@ int spi_read_register(const struct flashctx *flash, enum flash_reg reg, uint8_t
return 1;
}
- if (!flash->mst->spi.probe_opcode(flash, read_cmd)) {
+ if (!spi_probe_opcode(flash, read_cmd)) {
msg_pdbg("%s: read from register %d not supported by programmer.\n", __func__, reg);
return SPI_INVALID_OPCODE;
}