diff options
author | Nick Kralevich <nnk@google.com> | 2013-11-05 11:02:56 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2013-11-05 11:02:56 -0800 |
commit | d4af5aff648f3dae69666821c624d5adb31c844a (patch) | |
tree | 5440d4e51da14b64e4a56b03e9d7ed1058a85668 | |
parent | 6d3be412647b0eab0adff8a2768736cf4eb68039 (diff) | |
parent | 1bb66b9ec3dfe71e18e3fe86addc96ddfe4e035f (diff) | |
download | akm-d4af5aff648f3dae69666821c624d5adb31c844a.tar.gz |
am 1bb66b9e: Merge "libsensors: do not use GNU old-style field designators"
* commit '1bb66b9ec3dfe71e18e3fe86addc96ddfe4e035f':
libsensors: do not use GNU old-style field designators
-rw-r--r-- | AK8975_FS/libsensors/sensors.cpp | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/AK8975_FS/libsensors/sensors.cpp b/AK8975_FS/libsensors/sensors.cpp index 4f20c9b..af0daea 100644 --- a/AK8975_FS/libsensors/sensors.cpp +++ b/AK8975_FS/libsensors/sensors.cpp @@ -98,27 +98,27 @@ static int open_sensors(const struct hw_module_t* module, const char* id, struct hw_device_t** device); static int sensors__get_sensors_list(struct sensors_module_t* module, - struct sensor_t const** list) + struct sensor_t const** list) { *list = sSensorList; return ARRAY_SIZE(sSensorList); } static struct hw_module_methods_t sensors_module_methods = { - open: open_sensors + .open = open_sensors }; struct sensors_module_t HAL_MODULE_INFO_SYM = { - common: { - tag: HARDWARE_MODULE_TAG, - version_major: 1, - version_minor: 0, - id: SENSORS_HARDWARE_MODULE_ID, - name: "AKM Sensor module", - author: "Asahi Kasei Microdevices", - methods: &sensors_module_methods, + .common = { + .tag = HARDWARE_MODULE_TAG, + .version_major = 1, + .version_minor = 0, + .id = SENSORS_HARDWARE_MODULE_ID, + .name = "AKM Sensor module", + .author = "Asahi Kasei Microdevices", + .methods = &sensors_module_methods, }, - get_sensors_list: sensors__get_sensors_list, + .get_sensors_list = sensors__get_sensors_list, }; struct sensors_poll_context_t { @@ -145,7 +145,7 @@ private: int mWritePipeFd; SensorBase* mSensors[numSensorDrivers]; - /* These function will be different depends on + /* These function will be different depends on * which sensor is implemented in AKMD program. */ int handleToDriver(int handle); @@ -266,7 +266,7 @@ int sensors_poll_context_t::setDelay_sub(int handle, int64_t ns) { /* has dependencies, choose shorter interval */ if (cur > ns) { err = mSensors[drv]->setDelay(handle, ns); - } + } } return err; } |