openwrt/flashrom
1
0
Fork 0
mirror of https://review.coreboot.org/flashrom.git synced 2025-11-04 07:00:39 +01:00
Code Issues Releases Wiki Activity

serprog.c: Use braces in both branches of conditional statement

Browse Source 
As per the coding style, if one branch of a conditional statement
needs braces, all other branches need to have braces as well.

BUG=b:185191942
TEST=builds

Change-Id: I4fdccbd66f0351af98811bf7c2d8e15f0a99d852
Signed-off-by: Anastasia Klimchuk <aklm@chromium.org>
Reviewed-on: https://review.coreboot.org/c/flashrom/+/54862
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-by: Edward O'Callaghan <quasisec@chromium.org>
This commit is contained in:
Anastasia Klimchuk
2021-05-24 10:07:56 +10:00
committed by Edward O'Callaghan
parent e2f10684b7
commit fd8447045a
1 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
serprog.c
View File

@@ -564,8 +564,9 @@ int serprog_init(void)
if (baud_str == NULL || *baud_str == '\0') {
baud = -1;
msg_pdbg("No baudrate specified, using the hardware's defaults.\n");
} else
} else {
baud = atoi(baud_str); // FIXME: replace atoi with strtoul
}
if (strlen(device) > 0) {
sp_fd = sp_openserport(device, baud);
if (sp_fd == SER_INV_FD) {
@@ -727,11 +728,11 @@ int serprog_init(void)
goto init_err_cleanup_exit;
}
if (strlen(f_spi_suffix) == 1) {
if (!strcasecmp(f_spi_suffix, "M"))
if (!strcasecmp(f_spi_suffix, "M")) {
f_spi_req *= 1000000;
else if (!strcasecmp(f_spi_suffix, "k"))
} else if (!strcasecmp(f_spi_suffix, "k")) {
f_spi_req *= 1000;
else {
} else {
msg_perr("Error: Garbage following 'spispeed' value.\n");
free(spispeed);
goto init_err_cleanup_exit;
@@ -747,17 +748,18 @@ int serprog_init(void)
buf[2] = (f_spi_req >> (2 * 8)) & 0xFF;
buf[3] = (f_spi_req >> (3 * 8)) & 0xFF;
if (sp_check_commandavail(S_CMD_S_SPI_FREQ) == 0)
if (sp_check_commandavail(S_CMD_S_SPI_FREQ) == 0) {
msg_pwarn(MSGHEADER "Warning: Setting the SPI clock rate is not supported!\n");
else if (sp_docommand(S_CMD_S_SPI_FREQ, 4, buf, 4, buf) == 0) {
} else if (sp_docommand(S_CMD_S_SPI_FREQ, 4, buf, 4, buf) == 0) {
f_spi = buf[0];
f_spi |= buf[1] << (1 * 8);
f_spi |= buf[2] << (2 * 8);
f_spi |= buf[3] << (3 * 8);
msg_pdbg(MSGHEADER "Requested to set SPI clock frequency to %u Hz. "
"It was actually set to %u Hz\n", f_spi_req, f_spi);
} else
} else {
msg_pwarn(MSGHEADER "Setting SPI clock rate to %u Hz failed!\n", f_spi_req);
}
}
free(spispeed);
bt = serprog_buses_supported;
@@ -871,10 +873,12 @@ int serprog_init(void)
if (sp_docommand(S_CMD_S_PIN_STATE, 1, &en, 0, NULL) != 0) {
msg_perr("Error: could not enable output buffers\n");
goto init_err_cleanup_exit;
} else
} else {
msg_pdbg(MSGHEADER "Output drivers enabled\n");
} else
}
} else {
msg_pdbg(MSGHEADER "Warning: Programmer does not support toggling its output drivers\n");
}
sp_prev_was_write = 0;
sp_streamed_transmit_ops = 0;