diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2015-04-02 15:09:09 +0300 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2015-04-02 15:09:09 +0300 |
| commit | 1fd29be5cede285e673d3ed73d9ed9db59536b33 (patch) | |
| tree | 47d64b98c24c08ac49975a5a37ab821b7c4ad4e5 /include/linux | |
| parent | 5fcad167315f224eaf6750b0fb85ee6c92f087cd (diff) | |
| parent | b70b82580248b5393241c986082842ec05a2b7d7 (diff) | |
| download | linux-1fd29be5cede285e673d3ed73d9ed9db59536b33.tar.xz | |
Merge branch 'for-4.0/upstream-fixes' into for-4.1/wacom
Conflicts:
drivers/hid/wacom_wac.c
Need to fetch the 4.0 fixes to apply 4.1 patches based on top
of those.
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/hid-sensor-hub.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/include/linux/hid-sensor-hub.h b/include/linux/hid-sensor-hub.h index 51f7ccadf923..4173a8fdad9e 100644 --- a/include/linux/hid-sensor-hub.h +++ b/include/linux/hid-sensor-hub.h @@ -33,6 +33,8 @@ * @units: Measurment unit for this attribute. * @unit_expo: Exponent used in the data. * @size: Size in bytes for data size. + * @logical_minimum: Logical minimum value for this attribute. + * @logical_maximum: Logical maximum value for this attribute. */ struct hid_sensor_hub_attribute_info { u32 usage_id; @@ -146,6 +148,7 @@ int sensor_hub_input_get_attribute_info(struct hid_sensor_hub_device *hsdev, /** * sensor_hub_input_attr_get_raw_value() - Synchronous read request +* @hsdev: Hub device instance. * @usage_id: Attribute usage id of parent physical device as per spec * @attr_usage_id: Attribute usage id as per spec * @report_id: Report id to look for @@ -160,6 +163,7 @@ int sensor_hub_input_attr_get_raw_value(struct hid_sensor_hub_device *hsdev, u32 attr_usage_id, u32 report_id); /** * sensor_hub_set_feature() - Feature set request +* @hsdev: Hub device instance. * @report_id: Report id to look for * @field_index: Field index inside a report * @value: Value to set @@ -172,6 +176,7 @@ int sensor_hub_set_feature(struct hid_sensor_hub_device *hsdev, u32 report_id, /** * sensor_hub_get_feature() - Feature get request +* @hsdev: Hub device instance. * @report_id: Report id to look for * @field_index: Field index inside a report * @value: Place holder for return value |