summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShawn Nematbakhsh <shawnn@chromium.org>2017-06-14 11:53:01 -0700
committerchrome-bot <chrome-bot@chromium.org>2017-06-15 15:17:15 -0700
commit520f1aff7742afbeba5fb1720d27ac01de728968 (patch)
treefc8dd01d4b6d82b24a76ee17d850fcee601289f6
parentfcf7edff8cf2f7202799551f60ab2040b147c4ec (diff)
downloadchrome-ec-520f1aff7742afbeba5fb1720d27ac01de728968.tar.gz
coral: Remove unused / unassigned variables
Defects reported by Coverity. BUG=None BRANCH=None TEST=`make buildall -j` Signed-off-by: Shawn Nematbakhsh <shawnn@chromium.org> Change-Id: I083ef9e499076f7009717ccbe0a3ab0a055e1bed Reviewed-on: https://chromium-review.googlesource.com/535836 Commit-Ready: Shawn N <shawnn@chromium.org> Tested-by: Shawn N <shawnn@chromium.org> Reviewed-by: Scott Collyer <scollyer@chromium.org>
-rw-r--r--board/coral/board.c20
1 files changed, 7 insertions, 13 deletions
diff --git a/board/coral/board.c b/board/coral/board.c
index 2620770326..d722ca18db 100644
--- a/board/coral/board.c
+++ b/board/coral/board.c
@@ -824,9 +824,9 @@ const matrix_3x3_t mag_standard_ref = {
};
/* sensor private data */
+/* TODO(crbug.com/733352): Remove useless externs and declare these static. */
struct kionix_accel_data g_kx022_data;
struct bmi160_drv_data_t g_bmi160_data;
-struct bmp280_drv_data_t bmp280_drv_data;
struct opt3001_drv_data_t g_opt3001_data = {
.attenuation = 5,
};
@@ -1034,7 +1034,6 @@ static int board_read_version(enum adc_channel chan)
{
int mv;
int i;
- int version;
/* ID/SKU enable is active high */
gpio_set_flags(GPIO_EC_BRD_ID_EN, GPIO_OUT_HIGH);
@@ -1045,19 +1044,14 @@ static int board_read_version(enum adc_channel chan)
/* Disable ID/SKU circuit */
gpio_set_flags(GPIO_EC_BRD_ID_EN, GPIO_INPUT);
- if (mv == ADC_READ_ERROR) {
- version = BOARD_VERSION_UNKNOWN;
- return version;
- }
+ if (mv == ADC_READ_ERROR)
+ return BOARD_VERSION_UNKNOWN;
- for (i = 0; i < BOARD_VERSION_COUNT; i++) {
- if (mv < coral_board_versions[i].thresh_mv) {
- version = coral_board_versions[i].version;
- break;
- }
- }
+ for (i = 0; i < BOARD_VERSION_COUNT; i++)
+ if (mv < coral_board_versions[i].thresh_mv)
+ return coral_board_versions[i].version;
- return version;
+ return BOARD_VERSION_UNKNOWN;
}
int board_get_version(void)