summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNick Kralevich <nnk@google.com>2013-11-07 03:32:50 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2013-11-07 03:32:50 +0000
commitf740c98b96e14557b630ec5b16a2125afe424a2d (patch)
tree6947f0d68fa2319fdaff353576789dbb69f968f4
parente35dafa88f1ba15a30b95556755ab17c7207be9d (diff)
parent328b6639f4c0ffdef1ec47d7a67df5cddf421380 (diff)
downloadandroid_hardware_qcom_keymaster-f740c98b96e14557b630ec5b16a2125afe424a2d.tar.gz
android_hardware_qcom_keymaster-f740c98b96e14557b630ec5b16a2125afe424a2d.tar.bz2
android_hardware_qcom_keymaster-f740c98b96e14557b630ec5b16a2125afe424a2d.zip
Merge "do not use GNU old-style field designators"
-rw-r--r--keymaster_qcom.cpp22
1 files changed, 11 insertions, 11 deletions
diff --git a/keymaster_qcom.cpp b/keymaster_qcom.cpp
index 683b4a2..0058b09 100644
--- a/keymaster_qcom.cpp
+++ b/keymaster_qcom.cpp
@@ -733,20 +733,20 @@ static int qcom_km_open(const hw_module_t* module, const char* name,
}
static struct hw_module_methods_t keystore_module_methods = {
- open: qcom_km_open,
+ .open = qcom_km_open,
};
struct keystore_module HAL_MODULE_INFO_SYM
__attribute__ ((visibility ("default"))) = {
- common: {
- tag: HARDWARE_MODULE_TAG,
- version_major: 1,
- version_minor: 0,
- id: KEYSTORE_HARDWARE_MODULE_ID,
- name: "Keymaster QCOM HAL",
- author: "The Android Open Source Project",
- methods: &keystore_module_methods,
- dso: 0,
- reserved: {},
+ .common = {
+ .tag = HARDWARE_MODULE_TAG,
+ .version_major = 1,
+ .version_minor = 0,
+ .id = KEYSTORE_HARDWARE_MODULE_ID,
+ .name = "Keymaster QCOM HAL",
+ .author = "The Android Open Source Project",
+ .methods = &keystore_module_methods,
+ .dso = 0,
+ .reserved = {},
},
};