summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCraig Hesling <hesling@chromium.org>2019-11-14 18:57:49 +0000
committerCommit Bot <commit-bot@chromium.org>2019-11-15 04:53:10 +0000
commite2f451e10da4701d69c37beca44e6cc04ca1f017 (patch)
tree0e297f524d9be0540c0c3af4050f4e1233b7724b
parent6e3c061c4baae0e3169ee5371462615f5153fbed (diff)
downloadchrome-ec-e2f451e10da4701d69c37beca44e6cc04ca1f017.tar.gz
mock: Change mock initializer to compound literal
This ensures that these initializer/reset macros can be used as a reset value (after initialization). BRANCH=nocturne,nami BUG=none TEST=make buildall -j Signed-off-by: Craig Hesling <hesling@chromium.org> Change-Id: I5f4675399c87d959235b09e04c04e3613834421a Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/1917580 Reviewed-by: Daisuke Nojiri <dnojiri@chromium.org>
-rw-r--r--include/mock/fp_sensor_mock.h2
-rw-r--r--include/mock/mkbp_events_mock.h2
-rw-r--r--include/mock/rollback_mock.h2
3 files changed, 3 insertions, 3 deletions
diff --git a/include/mock/fp_sensor_mock.h b/include/mock/fp_sensor_mock.h
index 51840476a7..df2dc7614e 100644
--- a/include/mock/fp_sensor_mock.h
+++ b/include/mock/fp_sensor_mock.h
@@ -28,7 +28,7 @@ struct mock_ctrl_fp_sensor {
};
#define MOCK_CTRL_DEFAULT_FP_SENSOR \
-{ \
+(struct mock_ctrl_fp_sensor) { \
.fp_sensor_init_return = EC_SUCCESS, \
.fp_sensor_deinit_return = EC_SUCCESS, \
.fp_sensor_get_info_return = EC_SUCCESS, \
diff --git a/include/mock/mkbp_events_mock.h b/include/mock/mkbp_events_mock.h
index 0634451b9d..3d686e3618 100644
--- a/include/mock/mkbp_events_mock.h
+++ b/include/mock/mkbp_events_mock.h
@@ -16,7 +16,7 @@ struct mock_ctrl_mkbp_events {
};
#define MOCK_CTRL_DEFAULT_MKBP_EVENTS \
-{ \
+(struct mock_ctrl_mkbp_events) { \
.mkbp_send_event_return = 1, \
}
diff --git a/include/mock/rollback_mock.h b/include/mock/rollback_mock.h
index 9bd0b8df5f..576f87e6b9 100644
--- a/include/mock/rollback_mock.h
+++ b/include/mock/rollback_mock.h
@@ -18,7 +18,7 @@ struct mock_ctrl_rollback {
};
#define MOCK_CTRL_DEFAULT_ROLLBACK \
-{ \
+(struct mock_ctrl_rollback) { \
.get_secret_fail = false, \
}