diff options
| author | Shiyu Sun <sshiyu@google.com> | 2020-04-30 16:51:09 +1000 |
|---|---|---|
| committer | Edward O'Callaghan <quasisec@chromium.org> | 2020-05-01 00:57:19 +0000 |
| commit | 7f87f9fdc29519be125a229707830dddc4187d1f (patch) | |
| tree | 37a50f286ac2fb8396fbca5062d0f2940881b103 | |
| parent | e4ddc36371bc07c71889f21f9144160c756e9825 (diff) | |
| download | flashrom-7f87f9fdc29519be125a229707830dddc4187d1f.tar.gz flashrom-7f87f9fdc29519be125a229707830dddc4187d1f.tar.bz2 flashrom-7f87f9fdc29519be125a229707830dddc4187d1f.zip | |
lspcon_i2c_spi.c: Prefix with fn name instead of just 'Error:'
Replace log lines with the prefix formatter '%s: ..' and pass
'__func__' to the printers so that errors are prefixed with the
function from which they originated.
BUG=b:154285774
BRANCH=none
TEST=build success
Change-Id: If3205d8e453cfcd37f725b4fd135fe1221c913c0
Signed-off-by: Shiyu Sun <sshiyu@chromium.org>
Reviewed-on: https://review.coreboot.org/c/flashrom/+/40901
Reviewed-by: Edward O'Callaghan <quasisec@chromium.org>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
| -rw-r--r-- | lspcon_i2c_spi.c | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/lspcon_i2c_spi.c b/lspcon_i2c_spi.c index 72ed78a3..7b9f1c09 100644 --- a/lspcon_i2c_spi.c +++ b/lspcon_i2c_spi.c @@ -154,7 +154,7 @@ static int lspcon_i2c_spi_wait_command_done(int fd, unsigned int offset, int mas } while (!ret && (val & mask) && ++tried < MAX_SPI_WAIT_RETRIES); if (tried == MAX_SPI_WAIT_RETRIES) { - msg_perr("Error: Time out on sending command.\n"); + msg_perr("%s: Time out on sending command.\n", __func__); return -MAX_SPI_WAIT_RETRIES; } @@ -179,7 +179,7 @@ static int lspcon_i2c_spi_wait_rom_free(int fd) } while (!ret && (val & SWSPICTL_ACCESS_TRIGGER) && ++tried < MAX_SPI_WAIT_RETRIES); if (tried == MAX_SPI_WAIT_RETRIES) { - msg_perr("Error: Time out on waiting ROM free.\n"); + msg_perr("%s: Time out on waiting ROM free.\n", __func__); return -MAX_SPI_WAIT_RETRIES; } @@ -258,7 +258,8 @@ static int lspcon_i2c_spi_send_command(const struct flashctx *flash, { unsigned int i; if (writecnt > 16 || readcnt > 16 || writecnt == 0) { - msg_perr("Error: Invalid read/write count for send command.\n"); + msg_perr("%s: Invalid read/write count for send command.\n", + __func__); return SPI_GENERIC_ERROR; } @@ -402,7 +403,8 @@ static int lspcon_i2c_spi_write_256(struct flashctx *flash, const uint8_t *buf, static int lspcon_i2c_spi_write_aai(struct flashctx *flash, const uint8_t *buf, unsigned int start, unsigned int len) { - msg_perr("Error: AAI write function is not supported.\n"); + msg_perr("%s: AAI write function is not supported.\n", + __func__); return SPI_GENERIC_ERROR; } @@ -441,17 +443,19 @@ static int get_bus(void) errno = 0; int bus = (int)strtol(bus_str, &bus_suffix, 10); if (errno != 0 || bus_str == bus_suffix) { - msg_perr("Error: Could not convert 'bus'.\n"); + msg_perr("%s: Could not convert 'bus'.\n", __func__); goto get_bus_done; } if (bus < 0 || bus > 255) { - msg_perr("Error: Value for 'bus' is out of range(0-255).\n"); + msg_perr("%s: Value for 'bus' is out of range(0-255).\n", + __func__); goto get_bus_done; } if (strlen(bus_suffix) > 0) { - msg_perr("Error: Garbage following 'bus' value.\n"); + msg_perr("%s: Garbage following 'bus' value.\n", + __func__); goto get_bus_done; } @@ -459,7 +463,7 @@ static int get_bus(void) ret = bus; goto get_bus_done; } else { - msg_perr("Error: Bus number not specified.\n"); + msg_perr("%s: Bus number not specified.\n", __func__); } get_bus_done: if (bus_str) |